diff options
| author | Mike Frysinger <vapier@google.com> | 2018-02-06 18:25:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-06 18:25:54 +0000 |
| commit | 450c08b69210d7a2093432e1b5b5d91e3a7dc28a (patch) | |
| tree | e12ffa400796237bd2e5c0c5d04005ac15733875 | |
| parent | b94b51bf98174054399c45e79a2feb7a1565f87b (diff) | |
| parent | 0d40743b674795380c79354fe07f6553d3751689 (diff) | |
| download | minijail-450c08b69210d7a2093432e1b5b5d91e3a7dc28a.tar.gz | |
minijail0_cli_unittest: fix random crashes/failures am: 9741372f23
am: 0d40743b67
Change-Id: I5c89f0d0a8c359d639540c6a104fd6da5dd9aa9c
| -rw-r--r-- | minijail0_cli_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/minijail0_cli_unittest.cc b/minijail0_cli_unittest.cc index a774d55..2427a01 100644 --- a/minijail0_cli_unittest.cc +++ b/minijail0_cli_unittest.cc @@ -42,8 +42,10 @@ class CliTest : public ::testing::Test { // as it parses things (which is normally permissible with argv). int parse_args_(const std::vector<std::string>& argv, int *exit_immediately, ElfType *elftype) { - // Make sure we reset the getopts state when scanning a new argv. - optind = 1; + // Make sure we reset the getopts state when scanning a new argv. Setting + // this to 0 is a GNU extension, but AOSP/BSD also checks this (as an alias + // to their "optreset"). + optind = 0; std::vector<const char *> pargv; pargv.push_back("minijail0"); |