From 6b7d53a7ca25f43eea39801a8a6877c3e9ad49c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=A9=99=E5=AD=90=E7=96=AF?= Date: Tue, 5 Dec 2023 10:20:58 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E5=8F=82=E6=95=B0=E6=9C=80=E5=A4=A7=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E5=AE=8F=E5=80=BC=E8=B6=85=E8=BF=87=E4=B8=80=E5=AE=9A=E5=80=BC?= =?UTF-8?q?=E5=AE=B9=E6=98=93=E5=AF=BC=E8=87=B4=E8=A7=A3=E6=9E=90=E5=87=BA?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 大橙子疯 --- Param/src/param.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Param/src/param.c b/Param/src/param.c index e16078e..3f627ad 100644 --- a/Param/src/param.c +++ b/Param/src/param.c @@ -805,7 +805,7 @@ static uint16_t ParamInfoFormStream(ParamInfo_t *param, const uint8_t *pbuf) #endif #if PARAM_USE_STRING_TYPE case PARAM_STRING: - memcpy(param->unCurValuePtr.pString, &pbuf[0], PARAM_STRING_MAX_LENGTH); + memcpy(param->unCurValuePtr.pString, &pbuf[0], param->length); break; #endif default: @@ -1004,7 +1004,7 @@ static uint16_t ParamInfoToStream(uint8_t *pbuf, ParamInfo_t *param) #endif #if PARAM_USE_STRING_TYPE case PARAM_STRING: - memcpy(&pbuf[0], param->unCurValuePtr.pString, PARAM_STRING_MAX_LENGTH); + memcpy(&pbuf[0], param->unCurValuePtr.pString, param->length); break; #endif default: From 2ba334a521b58cfcbea8512e4017276674f29139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E6=A9=99=E5=AD=90=E7=96=AF?= Date: Tue, 5 Dec 2023 10:23:00 +0000 Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E5=8F=82=E6=95=B0=E8=A1=A8?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E9=95=BF=E5=BA=A6=E5=92=8C=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=9A=84=E6=95=B0=E6=8D=AE=E9=95=BF=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=97=B6=E8=BF=87=E6=BB=A4=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 大橙子疯 --- Param/src/param.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Param/src/param.c b/Param/src/param.c index 3f627ad..529cecd 100644 --- a/Param/src/param.c +++ b/Param/src/param.c @@ -904,7 +904,7 @@ int Param_Load(ParamManager_t *manager, pfnLoad_cb pfnLoadCallback, pfnCheckErro pParamInfo = (ParamInfo_t *)FindParamByID(manager, id); - if (pParamInfo == NULL) + if (pParamInfo == NULL || paramLength != pParamInfo->length) { ptr += paramLength; length -= paramLength;