Update NSS to NSS 3.14 pre-release snapshot 2012-06-26 01:00:00 PDT.

mozilla/security/nss/lib/util/dersubr.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "secder.h"
 #include <limits.h>
 #include "secerr.h"
 
 int
 DER_LengthLength(PRUint32 len)
@@ skipping 166 matching lines @@
 */
 long
 DER_GetInteger(SECItem *it)
 {
     long ival = 0;
     unsigned len = it->len;
     unsigned char *cp = it->data;
     unsigned long overflow = 0x1ffUL << (((sizeof(ival) - 1) * 8) - 1);
     unsigned long ofloinit;
 
+    PORT_Assert(len);
+    if (!len) {
+        PORT_SetError(SEC_ERROR_INPUT_LEN);
+        return 0;
+    }
+
     if (*cp & 0x80)
         ival = -1L;
     ofloinit = ival & overflow;
 
     while (len) {
         if ((ival & overflow) != ofloinit) {
             PORT_SetError(SEC_ERROR_BAD_DER);
             if (ival < 0) {
                 return LONG_MIN;
             }
             return LONG_MAX;
         }
         ival = ival << 8;
         ival |= *cp++;
         --len;
     }
     return ival;
 }
 
 /*
 ** Convert a der encoded *unsigned* integer into a machine integral value.
-** If an underflow/overflow occurs, sets error code and returns min/max.
+** If an overflow occurs, sets error code and returns max.
 */
 unsigned long
 DER_GetUInteger(SECItem *it)
 {
     unsigned long ival = 0;
     unsigned len = it->len;
     unsigned char *cp = it->data;
     unsigned long overflow = 0xffUL << ((sizeof(ival) - 1) * 8);
 
+    PORT_Assert(len);
+    if (!len) {
+        PORT_SetError(SEC_ERROR_INPUT_LEN);
+        return 0;
+    }
+
     /* Cannot put a negative value into an unsigned container. */
     if (*cp & 0x80) {
         PORT_SetError(SEC_ERROR_BAD_DER);
         return 0;
     }
 
     while (len) {
         if (ival & overflow) {
             PORT_SetError(SEC_ERROR_BAD_DER);
             return ULONG_MAX;
         }
         ival = ival << 8;
         ival |= *cp++;
         --len;
     }
     return ival;
 }