aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2018-02-06 18:20:25 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-06 18:20:25 +0000
commit0d40743b674795380c79354fe07f6553d3751689 (patch)
treee12ffa400796237bd2e5c0c5d04005ac15733875
parente998c8fdc2d087b8661789ec414b0a7c9aed3b3d (diff)
parent9741372f23e7895a180a535c9bfd7246bb69dd2b (diff)
downloadminijail-0d40743b674795380c79354fe07f6553d3751689.tar.gz
minijail0_cli_unittest: fix random crashes/failures
am: 9741372f23 Change-Id: Ica3b6c63a09749bf7887b250cea0d42c65e5eb01
-rw-r--r--minijail0_cli_unittest.cc6
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");