commit 4854e292e0cd0eb58bce4488dc849273904d9302
author Tao Bao <tbao@google.com> Tue Aug 11 16:17:24 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 16:17:24 2015 +0000
tree 20e0b8c930d0eb3097e8592f56b833dc82dd9e51
parent 434a1761aac48b8e3c13d5a6cb3edd90c8667f6f
parent ad509fd4a2c597ced8e53b0817f754cb2209b98a

am ad509fd4: Merge "Fix potential crash"

* commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a':
  Fix potential crash

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 515470f..c683bae 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -1036,11 +1036,15 @@
         if (strncmp(update_package, "CACHE:", 6) == 0) {
             int len = strlen(update_package) + 10;
             char* modified_path = (char*)malloc(len);
-            strlcpy(modified_path, "/cache/", len);
-            strlcat(modified_path, update_package+6, len);
-            printf("(replacing path \"%s\" with \"%s\")\n",
-                   update_package, modified_path);
-            update_package = modified_path;
+            if (modified_path) {
+                strlcpy(modified_path, "/cache/", len);
+                strlcat(modified_path, update_package+6, len);
+                printf("(replacing path \"%s\" with \"%s\")\n",
+                       update_package, modified_path);
+                update_package = modified_path;
+            }
+            else
+                printf("modified_path allocation failed\n");
         }
     }
     printf("\n");