commit 4e212c9f2a1257e80592911e59f915e36f7b02dc
author bohu <bohu@google.com> Tue Feb 26 18:56:19 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Feb 26 18:56:19 2019 -0800
tree 487e46d61c7b740d504a0af4917752fa978bbd29
parent ed8c4999ccb81a0533a9d495eb087fadec1bba36
parent 7e06dce35819dc0d8c20aa5f2cee0f207704321f

gptfdisk: fix buffer overrun am: 7404144dd9 am: a3c5581ff8
am: 7e06dce358

Change-Id: I89b767e679d72c0d4142cab6edbee6792efef6ff

android_popt.cc

diff --git a/android_popt.cc b/android_popt.cc
index b5b7970..98b7f99 100644
--- a/android_popt.cc
+++ b/android_popt.cc
@@ -29,8 +29,10 @@
     for (; options[count].longName; count++) {
     }
 
+    // getopt_long expects the last element to be null
+    // so allocate count + 1
     struct option *long_options = (struct option *)
-            calloc(count, sizeof(struct option));
+            calloc(count + 1, sizeof(struct option));
     for (int i = 0; options[i].longName; i++) {
         long_options[i].name = options[i].longName;
         long_options[i].flag = 0;