commit 085a53d791a6a412e4636adb657e569f13be3ee9
author Calin Juravle <calin@google.com> Wed Jun 20 18:03:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 20 18:03:38 2018 -0700
tree 72a7a61121298f8319212318a8b91ccc3eb9f3c8
parent 4615019a0a01ec69f6859a6f759d7073eb50e01a
parent 07031ce2109cfb8c015a7f4b81fbe0be92cb264d

Merge "Fix SEGFAULT in profman" am: 037b50ec79
am: 07031ce210

Change-Id: I9c26716c128509b8dc8c6273b10fc7aa390f7dfe

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index fa23d3a..0fd2dd4 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -773,7 +773,8 @@
     }
 
     // program name, reference profile fd, the final NULL and the profile fds
-    const char* argv[3 + profile_args.size() + apk_args.size() + (copy_and_update ? 1 : 0)];
+    const char* argv[3 + profile_args.size() + apk_args.size()
+            + dex_location_args.size() + (copy_and_update ? 1 : 0)];
     int i = 0;
     argv[i++] = profman_bin;
     argv[i++] = reference_profile_arg.c_str();