Update NSPR to the NSPR_4_8_1_BETA2 CVS tag. Includes fixes for

bug 414772 and bug 516396.

nsprpub/config/prdepend.h

@@ -42,4 +42,3 @@
  */
 
 #error "Do not include this header file."
-

nsprpub/pr/include/prinit.h

@@ -63,7 +63,7 @@ PR_BEGIN_EXTERN_C
 ** The format of the version string is
 **     "<major version>.<minor version>[.<patch level>] [<Beta>]"
 */
-#define PR_VERSION  "4.8.1 Beta 1"
+#define PR_VERSION  "4.8.1 Beta 2"
 #define PR_VMAJOR   4
 #define PR_VMINOR   8
 #define PR_VPATCH   1

nsprpub/pr/src/misc/prdtoa.c

@@ -1362,10 +1362,6 @@ d2b
 		    b->wds = (x[1] = z) ? 2 : 1;
 		}
 	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
 		k = lo0bits(&z);
 		x[0] = z;
 #ifndef Sudden_Underflow
@@ -1644,6 +1640,13 @@ PR_strtod
 
 	if (!_pr_initialized) _PR_ImplicitInitialization();
 
+	for(s = s00, i = 0; *s && i < 64 * 1024; s++, i++)
+		;
+	if (*s) {
+		PR_SetError(PR_INVALID_ARGUMENT_ERROR, 0);
+		return 0.0;
+		}
+
 	sign = nz0 = nz = 0;
 	dval(rv) = 0.;
 	for(s = s00;;s++) switch(*s) {

nsprpub/pr/tests/dtoa.c

@@ -208,6 +208,13 @@ int main(int argc, char **argv)
 	fprintf(stderr,"Failed to convert numeric value %lf %s\n",num,cnvt);
         failed_already = 1;
     }
+
+    /*
+     * Bug 414772: should not exit with "Zero passed to d2b" in debug
+     * build.
+     */
+    num1 = PR_strtod("4e-356",NULL);
+
     if (failed_already) {
         printf("FAILED\n");
     } else {