commit 037b50ec793155cc965a02cb03be91a6158b6866
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 21 00:44:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 21 00:44:22 2018 +0000
tree ac08127c8f4e9e4c1ba2a680bac99f0523d92c30
parent 0a34c5799092c55879445150f3acc8dc9cd49c95
parent a30265a2dc243386f822aae8c59748d40bb523bd

Merge "Fix SEGFAULT in profman"

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index a19ce09..9dfbfd3 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -771,7 +771,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();