commit dbcff0f5d45798d18bf8fe0c26bf854fdc2f7f62
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 24 23:09:26 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 24 23:09:26 2019 -0700
tree f88b72f8ccf8e28249a6167db5e343486a0dfbb3
parent cac25bb06dbf8dce4eda31b3d9afabe18a218968
parent 8c79ab7ef06f5eeb5df30a797aeb1b356c720a8c

Merge "avb: Fix AvbSlotVerifyData->cmdline might be NULL"

platform/msm_shared/avb/libavb/avb_slot_verify.c

diff --git a/platform/msm_shared/avb/libavb/avb_slot_verify.c b/platform/msm_shared/avb/libavb/avb_slot_verify.c
index 8d0db6d..5818fa1 100644
--- a/platform/msm_shared/avb/libavb/avb_slot_verify.c
+++ b/platform/msm_shared/avb/libavb/avb_slot_verify.c
@@ -1412,10 +1412,13 @@
       if (has_system_partition(ops, ab_suffix)) {
         slot_data->cmdline =
             avb_strdup("root=PARTUUID=$(ANDROID_SYSTEM_PARTUUID)");
-        if (slot_data->cmdline == NULL) {
-          ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
-          goto fail;
-        }
+      } else {
+        // The |cmdline| field should be a NUL-terminated string.
+        slot_data->cmdline = avb_strdup("");
+      }
+      if (slot_data->cmdline == NULL) {
+        ret = AVB_SLOT_VERIFY_RESULT_ERROR_OOM;
+        goto fail;
       }
     } else {
       /* Add options - any failure in append_options() is either an
@@ -1433,7 +1436,7 @@
     }
 
     /* Substitute $(ANDROID_SYSTEM_PARTUUID) and friends. */
-    if (slot_data->cmdline != NULL) {
+    if (slot_data->cmdline != NULL && avb_strlen(slot_data->cmdline) != 0) {
       char* new_cmdline;
       new_cmdline = sub_cmdline(
           ops, slot_data->cmdline, ab_suffix, using_boot_for_vbmeta);