Merge pull request #2205 from spevans/pr_builtin_overflow_fix

swift-ci · web-flow · commit 9ba604dcb115 · 2019-05-02T12:29:22.000-07:00
diff --git a/CoreFoundation/String.subproj/CFString.c b/CoreFoundation/String.subproj/CFString.c
@@ -6442,9 +6442,9 @@ reswtch:switch (ch) {
 		return true;
 	    }
 	case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': {
-	    int64_t number = 0;
+            long long number = 0;
 	    do {
-                if (__builtin_smulll_overflow(number, 10, &number) || __builtin_saddll_overflow(number, ch - '0', &number)) {
+                if (__builtin_smulll_overflow(number, 10, &number) || __builtin_saddll_overflow(number, ch - '0', &number) || number > INT64_MAX) {
                     if (errorPtr) *errorPtr = __CFCreateOverflowError();
                     return false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -6442,9 +6442,9 @@ reswtch:switch (ch) {`
`6442`	`6442`	`return true;`
`6443`	`6443`	`}`
`6444`	`6444`	`case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': {`
`6445`		`- int64_t number = 0;`
	`6445`	`+ long long number = 0;`
`6446`	`6446`	`do {`
`6447`		`- if (__builtin_smulll_overflow(number, 10, &number) \|\| __builtin_saddll_overflow(number, ch - '0', &number)) {`
	`6447`	`+ if (__builtin_smulll_overflow(number, 10, &number) \|\| __builtin_saddll_overflow(number, ch - '0', &number) \|\| number > INT64_MAX) {`
`6448`	`6448`	`if (errorPtr) *errorPtr = __CFCreateOverflowError();`
`6449`	`6449`	`return false;`
`6450`	`6450`	`}`