commit b7302b99738d073774ed331b9a262b51248342de
author Firoz Khan <firozk@codeaurora.org> Wed Sep 19 14:55:00 2018 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 19 23:55:37 2018 -0700
tree baf5a0f6703bd8e0f1d5cbcaf4d69142011abbf1
parent 6f6d59ec9d52489415ec5924d3be945db0f04b43

platform: msm_shared: avb: perform NULL check

new_str can be a NULL pointer. Need to perform a NULL check.
No need to perform NULL check for ret variable as else
condition is executed by checking the ret value.

Change-Id: I50efce86b5a141a36a93998d5d56baf8846fb841
Signed-off-by: Firoz Khan <firozk@codeaurora.org>

platform/msm_shared/avb/libavb/avb_util.c

diff --git a/platform/msm_shared/avb/libavb/avb_util.c b/platform/msm_shared/avb/libavb/avb_util.c
index 43662b4..09b05f1 100644
--- a/platform/msm_shared/avb/libavb/avb_util.c
+++ b/platform/msm_shared/avb/libavb/avb_util.c
@@ -299,9 +299,8 @@
       char* new_str;
       num_new = ret_len + num_before + replace_len + 1;
       new_str = avb_malloc(num_new);
-      if (ret == NULL) {
+      if (new_str == NULL)
         goto out;
-      }
       avb_memcpy(new_str, ret, ret_len);
       avb_memcpy(new_str + ret_len, str, num_before);
       avb_memcpy(new_str + ret_len + num_before, replace, replace_len);
@@ -324,9 +323,8 @@
     size_t num_remaining = avb_strlen(str_after_last_replace);
     size_t num_new = ret_len + num_remaining + 1;
     char* new_str = avb_malloc(num_new);
-    if (ret == NULL) {
+    if (new_str == NULL)
       goto out;
-    }
     avb_memcpy(new_str, ret, ret_len);
     avb_memcpy(new_str + ret_len, str_after_last_replace, num_remaining);
     new_str[num_new - 1] = '\0';