diff options
| author | bohu <bohu@google.com> | 2019-02-26 18:56:19 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 18:56:19 -0800 |
| commit | 4e212c9f2a1257e80592911e59f915e36f7b02dc (patch) | |
| tree | 487e46d61c7b740d504a0af4917752fa978bbd29 | |
| parent | ed8c4999ccb81a0533a9d495eb087fadec1bba36 (diff) | |
| parent | 7e06dce35819dc0d8c20aa5f2cee0f207704321f (diff) | |
| download | gptfdisk-android10-d4-s1-release.tar.gz | |
gptfdisk: fix buffer overrun am: 7404144dd9 am: a3c5581ff8android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r43android-10.0.0_r42android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android10-qpr3-s1-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: 7e06dce358
Change-Id: I89b767e679d72c0d4142cab6edbee6792efef6ff
| -rw-r--r-- | android_popt.cc | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ poptContext poptGetContext(const char *name, int argc, const char **argv, 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; |