Merge pull request #1566 from bitcraze/tobba/eeprom_broken_or_corrupt_fix

Handle eeprom with no i2c answer and  kvd header error.

Author: tobbeanton

src/hal/src/radiolink.c

@@ -208,7 +208,8 @@ void radiolinkSyslinkDispatch(SyslinkPacket *slp)
 
 static int radiolinkReceiveCRTPPacket(CRTPPacket *p)
 {
-  if (xQueueReceive(crtpPacketDelivery, p, M2T(100)) == pdTRUE)
+  if (crtpPacketDelivery != 0 &&
+      xQueueReceive(crtpPacketDelivery, p, M2T(100)) == pdTRUE)
   {
     return 0;
   }
@@ -231,7 +232,8 @@ static int radiolinkSendCRTPPacket(CRTPPacket *p)
   slp.length = p->size + 1;
   memcpy(slp.data, &p->header, p->size + 1);
 
-  if (xQueueSend(txQueue, &slp, M2T(100)) == pdTRUE)
+  if (txQueue != 0 &&
+      xQueueSend(txQueue, &slp, M2T(100)) == pdTRUE)
   {
     return true;
   }

src/utils/src/configblockeeprom.c

@@ -170,6 +170,11 @@ int configblockInit(void)
       }
     }
   }
+  else
+  {
+    cb_ok = false;
+    return -1;
+  }
 
   if (cb_ok == false)
   {

src/utils/src/kve/kve_storage.c

@@ -140,7 +140,9 @@ size_t kveStorageFindItemByPrefix(kveMemory_t *kve, size_t address,
     uint8_t searchedKeyLength = strlen(prefix);
 
     while (currentAddress < (kve->memorySize - 3)) {
-        kve->read(currentAddress, searchBuffer, 3);
+        if (kve->read(currentAddress, searchBuffer, 3) == 0) {
+          return KVE_STORAGE_INVALID_ADDRESS;
+        }
         length = searchBuffer[0] + (searchBuffer[1]<<8);
         keyLength = searchBuffer[2];
 
@@ -150,13 +152,15 @@ size_t kveStorageFindItemByPrefix(kveMemory_t *kve, size_t address,
         }
 
         if (keyLength >= searchedKeyLength) {
-            kve->read(currentAddress + 3, &searchBuffer, keyLength);
-            if (!memcmp(prefix, searchBuffer, searchedKeyLength)) {
-                memcpy(keyBuffer, searchBuffer, keyLength);
-                keyBuffer[keyLength] = 0;
-                *itemAddress = currentAddress;
-                return length;
-            }
+          if (kve->read(currentAddress + 3, &searchBuffer, keyLength) == 0) {
+            return KVE_STORAGE_INVALID_ADDRESS;
+          }
+          if (!memcmp(prefix, searchBuffer, searchedKeyLength)) {
+              memcpy(keyBuffer, searchBuffer, keyLength);
+              keyBuffer[keyLength] = 0;
+              *itemAddress = currentAddress;
+              return length;
+          }
         }
 
         currentAddress += length;
@@ -171,7 +175,9 @@ size_t kveStorageFindEnd(kveMemory_t *kve, size_t address) {
     kveItemHeader_t header;
 
     while (currentAddress < (kve->memorySize - 2)) {
-        kve->read(currentAddress, &header, sizeof(header));
+        if (kve->read(currentAddress, &header, sizeof(header)) == 0) {
+          return KVE_STORAGE_INVALID_ADDRESS;
+        }
         if (header.full_length == KVE_END_TAG) {
             return currentAddress;
         }
@@ -192,7 +198,9 @@ size_t kveStorageFindHole(kveMemory_t *kve, size_t address) {
     kveItemHeader_t header;
 
     while (currentAddress < (kve->memorySize - 2)) {
-        kve->read(currentAddress, &header, sizeof(header));
+        if (kve->read(currentAddress, &header, sizeof(header)) == 0) {
+          return KVE_STORAGE_INVALID_ADDRESS;
+        }
         if (header.key_length == 0) {
             return currentAddress;
         }
@@ -210,20 +218,28 @@ size_t kveStorageFindNextItem(kveMemory_t *kve, size_t address)
     kveItemHeader_t header;
 
     // Jump over the current item
-    kve->read(currentAddress, &header, sizeof(header));
+    if (kve->read(currentAddress, &header, sizeof(header)) == 0) {
+      return KVE_STORAGE_INVALID_ADDRESS;
+    }
     if (header.full_length == KVE_END_TAG) {
         return KVE_STORAGE_INVALID_ADDRESS;
     }
+    if (header.full_length == 0) {
+        return KVE_STORAGE_INVALID_ADDRESS;
+    }
     currentAddress += header.full_length;
 
     while (currentAddress < (kve->memorySize - 3)) {
-        kve->read(currentAddress, &header, sizeof(header));
-
+        if (kve->read(currentAddress, &header, sizeof(header)) == 0) {
+          return KVE_STORAGE_INVALID_ADDRESS;
+        }
 
         if (header.full_length == KVE_END_TAG) {
             return KVE_STORAGE_INVALID_ADDRESS;
         }
-
+        if (header.full_length == 0) {
+            return KVE_STORAGE_INVALID_ADDRESS;
+        }
         if (header.key_length != 0) {
             return currentAddress;
         }