X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Finternal%2Ffloatscan.c;h=f6e331d45d52d95f0b6ea8358658da9c6b29d595;hp=aa962f41efb5676f56b9910dee38422c1e469869;hb=9448b0513e2eec020fbca9c10412b83df5027a16;hpb=77731d0ec16027cb0e3a593d5dd9bb906932303e

diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c
index aa962f41..f6e331d4 100644
--- a/src/internal/floatscan.c
+++ b/src/internal/floatscan.c
@@ -4,6 +4,7 @@
 #include <float.h>
 #include <limits.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "shgetc.h"
 #include "floatscan.h"
@@ -89,7 +90,7 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 			if (gotrad) break;
 			gotrad = 1;
 			lrp = dc;
-		} else if (k < KMAX-2) {
+		} else if (k < KMAX-3) {
 			dc++;
 			if (c!='0') lnz = dc;
 			if (j) x[k] = x[k]*10 + c-'0';
@@ -101,7 +102,7 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 			gotdig=1;
 		} else {
 			dc++;
-			if (c!='0') x[KMAX-3] |= 1;
+			if (c!='0') x[KMAX-4] |= 1;
 		}
 	}
 	if (!gotrad) lrp=dc;
@@ -143,7 +144,7 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 	}
 
 	/* Align incomplete final B1B digit */
-	if (k<KMAX && j) {
+	if (j) {
 		for (; j<9; j++) x[k]*=10;
 		k++;
 		j=0;
@@ -199,11 +200,11 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 		}
 		if (carry) {
 			rp += 9;
+			a = (a-1 & MASK);
 			if (a == z) {
 				z = (z-1 & MASK);
 				x[z-1 & MASK] |= x[z];
 			}
-			a = (a-1 & MASK);
 			x[a] = carry;
 		}
 	}
@@ -244,7 +245,7 @@ static long double decfloat(FILE *f, int c, int bits, int emin, int sign, int po
 
 	/* Assemble desired bits into floating point variable */
 	for (y=i=0; i<LD_B1B_DIG; i++) {
-		if ((a+i & MASK)==z) x[z=(z+1 & MASK)] = 0;
+		if ((a+i & MASK)==z) x[(z=(z+1 & MASK))-1] = 0;
 		y = 1000000000.0L * y + x[a+i & MASK];
 	}
 
@@ -352,7 +353,7 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
 		} else {
 			shlim(f, 0);
 		}
-		return 0;
+		return sign * 0.0;
 	}
 	if (!gotrad) rp = dc;
 	while (dc<8) x *= 16, dc++;
@@ -414,7 +415,7 @@ static long double hexfloat(FILE *f, int bits, int emin, int sign, int pok)
 long double __floatscan(FILE *f, int prec, int pok)
 {
 	int sign = 1;
-	int i;
+	size_t i;
 	int bits;
 	int emin;
 	int c;
@@ -455,6 +456,24 @@ long double __floatscan(FILE *f, int prec, int pok)
 	if (!i) for (i=0; i<3 && (c|32)=="nan"[i]; i++)
 		if (i<2) c = shgetc(f);
 	if (i==3) {
+		if (shgetc(f) != '(') {
+			shunget(f);
+			return NAN;
+		}
+		for (i=1; ; i++) {
+			c = shgetc(f);
+			if (c-'0'<10U || c-'A'<26U || c-'a'<26U || c=='_')
+				continue;
+			if (c==')') return NAN;
+			shunget(f);
+			if (!pok) {
+				errno = EINVAL;
+				shlim(f, 0);
+				return 0;
+			}
+			while (i--) shunget(f);
+			return NAN;
+		}
 		return NAN;
 	}