From 779210861b28924a0cdbad9cb5e126944e9a9141 Mon Sep 17 00:00:00 2001
From: ylz <ylzbotian@163.com>
Date: Fri, 13 Sep 2019 23:56:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=AD=A3=E3=80=911.=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8Fkey=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C=E4=BD=BF=E7=94=A8ef=5Fget=5Fenv=5Fb?=
 =?UTF-8?q?lob("key",=20NULL,=200,=20&len)=E4=BC=9A=E5=87=BA=E7=8E=B0asser?=
 =?UTF-8?q?t=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.第一次初始化时由于combined值随机导致get_next_sector_addr(sector)获取到的地址错误
---
 easyflash/src/ef_env.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/easyflash/src/ef_env.c b/easyflash/src/ef_env.c
index 07e6281..6a4a0b9 100644
--- a/easyflash/src/ef_env.c
+++ b/easyflash/src/ef_env.c
@@ -619,6 +619,7 @@ static EfErrCode read_sector_meta_data(uint32_t addr, sector_meta_data_t sector,
     /* check magic word */
     if (sector->magic != SECTOR_MAGIC_WORD) {
         sector->check_ok = false;
+        sector->combined = SECTOR_NOT_COMBINED;
         return EF_ENV_INIT_FAILED;
     }
     sector->check_ok = true;
@@ -809,7 +810,9 @@ static size_t get_env(const char *key, void *value_buf, size_t buf_len, size_t *
         } else {
             read_len = buf_len;
         }
-        ef_port_read(env.addr.value, (uint32_t *) value_buf, read_len);
+        if (value_buf){
+            ef_port_read(env.addr.value, (uint32_t *) value_buf, read_len);
+        }
     }
 
     return read_len;