Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/nsprpub/lib/libc/src/plgetopt.c

 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 159 matching lines @@
                 }
             }
         }
     }
 
     /*
     ** If we already have a '-' or '--' in hand, xargv points to the next
     ** option. See if we can find a match in the list of possible
     ** options supplied.
     */
-
     if (internal->minus == 2) 
     {
         char * foundEqual = strchr(internal->xargv,'=');
         PRIntn optNameLen = foundEqual ? (foundEqual - internal->xargv) :
                             strlen(internal->xargv);
         const PLLongOpt *longOpt = internal->longOpts;
+        PLOptStatus result = PL_OPT_BAD;
 
         opt->option = 0;
         opt->value  = NULL;
 
         for (; longOpt->longOptName; ++longOpt) 
         {
             if (strncmp(longOpt->longOptName, internal->xargv, optNameLen))
                 continue;  /* not a possible match */
             if (strlen(longOpt->longOptName) != optNameLen)
                 continue;  /* not a match */
             /* option name match */
             opt->longOptIndex = longOpt - internal->longOpts;
             opt->longOption   = longOpt->longOption;
+            /* value is part of the current argv[] element if = was found */
+            /* note: this sets value even for long options that do not
+             * require option if specified as --long=value */
             if (foundEqual) 
             {
-                opt->value = foundEqual[1] ? foundEqual + 1 : NULL;
+                opt->value = foundEqual + 1;
             }
             else if (longOpt->valueRequired)
             {
-                opt->value = internal->argv[++(internal->xargc)];
+                /* value is the next argv[] element, if any */
+                if (internal->xargc + 1 < internal->argc)
+                {
+                    opt->value = internal->argv[++(internal->xargc)];
+                }
+                /* missing value */
+                else
+                {
+                    break; /* return PL_OPT_BAD */
+                }
             }
-            internal->xargv = &static_Nul; /* consume this */
-            return PL_OPT_OK;
+            result = PL_OPT_OK;
+            break;
         }
         internal->xargv = &static_Nul; /* consume this */
-        return PL_OPT_BAD;
+        return result;
     }
     if (internal->minus)
     {
         PRIntn cop;
         PRIntn eoo = internal->optionsLen;
         for (cop = 0; cop < eoo; ++cop)
         {
             if (internal->options[cop] == *internal->xargv)
             {
                 opt->option = *internal->xargv++;
                 opt->longOption = opt->option & 0xff;
                 /*
                 ** if options indicates that there's an associated
-                ** value, this argv is finished and the next is the
-                ** option's value.
+                ** value, it must be provided, either as part of this
+                ** argv[] element or as the next one
                 */
                 if (':' == internal->options[cop + 1])
                 {
-                    if (0 != *internal->xargv) 
+                    /* value is part of the current argv[] element */
+                    if (0 != *internal->xargv)
+                    {
+                        opt->value = internal->xargv;
+                    }
+                    /* value is the next argv[] element, if any */
+                    else if (internal->xargc + 1 < internal->argc)
+                    {
+                        opt->value = internal->argv[++(internal->xargc)];
+                    }
+                    /* missing value */
+                    else
+                    {
                         return PL_OPT_BAD;
-                    opt->value = internal->argv[++(internal->xargc)];
+                    }
+
                     internal->xargv = &static_Nul;
                     internal->minus = 0;
                 }
                 else 
                     opt->value = NULL; 
                 return PL_OPT_OK;
             }
         }
         internal->xargv += 1;  /* consume that option */
         return PL_OPT_BAD;
     }
+
     /*
     ** No '-', so it must be a standalone value. The option is nul.
     */
     opt->value = internal->argv[internal->xargc];
     internal->xargv = &static_Nul;
     opt->option = 0;
     return PL_OPT_OK;
 }  /* PL_GetNextOpt */
 
 /* plgetopt.c */