commit 99857187cb33428be716f6a10da1e59fef6fb759
author himta ram <hram@codeaurora.org> Wed Jan 24 09:07:46 2018 +0530
committer himta ram <hram@codeaurora.org> Thu Jan 25 10:57:21 2018 +0530
tree 3e9482eed5794215208e87098c151b0aa6f179ef
parent ee397206894cfb727b8b2ce021f584f737518d17

FM: Fix static analysis issue.
KW issue Suspicious dereference of pointer 'val' by passing argument 1 to 
function 'strlen'before NULL check, fixed by putting null check

Change-Id: I210b40ce8a309b47d7e72b19efc7a8adb1cfbe49

jni/ConfFileParser.cpp

diff --git a/jni/ConfFileParser.cpp b/jni/ConfFileParser.cpp
index 444d3c3..d270690 100644
--- a/jni/ConfFileParser.cpp
+++ b/jni/ConfFileParser.cpp
@@ -850,7 +850,8 @@
   unsigned int key_hash_code;
   unsigned int grp_index;
   unsigned int key_index;
-  unsigned key_len, val_len;
+  unsigned key_len = 0;
+  unsigned val_len = 0;
   group *grp = NULL;
   key_value_pair_list *list = NULL;
 
@@ -885,7 +886,9 @@
                             val pair\n");
                      goto err;
                   }
-                  key_len = strlen(key);
+                  if(key) {
+                      key_len = strlen(key);
+                  }
                   list->key = (char *)malloc(sizeof(char) *
                                               (key_len + 1));
                   if(list->key == NULL) {
@@ -893,7 +896,9 @@
                      free(list);
                      goto err;
                   }
-                  val_len = strlen(val);
+                  if(val) {
+                      val_len = strlen(val);
+                  }
                   list->value = (char *)malloc(sizeof(char) *
                                                 (val_len + 1));
                   if(!list->value) {