release-request-ca4ad653-1655-436a-b65c-2527b02ae5f2-for-git_oc-mr1-release-4241196 snap-temp-L48200000088705722

Change-Id: I92d7773d0741825a11ea919c863bc861e35ec7ca
diff --git a/android_popt.cc b/android_popt.cc
index a1492c6..b5b7970 100644
--- a/android_popt.cc
+++ b/android_popt.cc
@@ -98,7 +98,7 @@
 #ifdef LOCAL_DEBUG
     fprintf(stderr, "getopt_long()=%c\n", res);
 #endif
-    if (res == 0 || res == '?') {
+    if (res <= 0 || res == '?' || i == -1) {
         return -1;
     }