fixed safe usage of strlen

joelguittet · Nov 18, 2024 · dcb2e83 · dcb2e83
1 parent a2c2387
commit dcb2e83
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/core/src/mender-utils.c b/core/src/mender-utils.c
@@ -303,19 +303,23 @@ mender_utils_keystore_get_item_index(mender_keystore_t *keystore, char *name) {
 
     /* Find item index */
     int index = 0;
-    if (NULL != keystore) {
+    if ((NULL != keystore) && (NULL != name)) {
         while ((NULL != keystore[index].name) && (NULL != keystore[index].value)) {
-            /* Compare name string length */
-            if (strlen(keystore[index].name) != strlen(name)) {
-                index++;
-                continue;
-            }
-            /* Compare name strings */
-            if (0 != strncmp(keystore[index].name, name, strlen(name))) {
-                index++;
-                continue;
+
+            if (NULL != keystore[index].name) {
+                /* Compare name string length */
+                if (strlen(keystore[index].name) != strlen(name)) {
+                    index++;
+                    continue;
+                }
+
+                /* Compare name strings */
+                if (0 != strncmp(keystore[index].name, name, strlen(name))) {
+                    index++;
+                    continue;
+                }
+                return index;
             }
-            return index;
         }
     }