From 12f8f0864c8e7086c4df9165413f714d600cbc8c Mon Sep 17 00:00:00 2001 From: Wudi Date: Mon, 30 Dec 2019 21:25:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=86=20find=5Fenv=5Fcb()?= =?UTF-8?q?=20=E4=B8=AD=E4=BF=AE=E6=AD=A3=20bug=20=E5=90=8E=E9=81=97?= =?UTF-8?q?=E7=95=99=E7=9A=84=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E4=BA=86=20max=5Flen=20?= =?UTF-8?q?=E7=9A=84=E5=8F=98=E9=87=8F=E5=90=8D=E5=92=8C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easyflash/src/ef_env.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c index 8877895..c5b2a73 100644 --- a/easyflash/src/ef_env.c +++ b/easyflash/src/ef_env.c @@ -711,17 +711,13 @@ static bool find_env_cb(env_node_obj_t env, void *arg1, void *arg2) { const char *key = arg1; bool *find_ok = arg2; - uint8_t max_len = strlen(key); + size_t key_len = strlen(key); - if (max_len != env->name_len) { + if (key_len != env->name_len) { return false; } - - if (max_len < env->name_len) { - max_len = env->name_len; - } /* check ENV */ - if (env->crc_is_ok && env->status == ENV_WRITE && !strncmp(env->name, key, max_len)) { + if (env->crc_is_ok && env->status == ENV_WRITE && !strncmp(env->name, key, key_len)) { *find_ok = true; return true; }