msvcrt: Fix overflow checks in parse_double.

Old check is optimized out in gcc 9.3.0 when -O2 optimization is enabled. Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix overflow checks in parse_double.
405c99ef · Piotr Caban · Alexandre Julliard · d0a926ba · 405c99ef
Commit 405c99ef authored Apr 28, 2020 by Piotr Caban Committed by Alexandre Julliard Apr 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

string.c dlls/msvcrt/string.c +4 -4

No files found.
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -555,8 +555,8 @@ static double strtod16(MSVCRT_wchar_t get(void *ctx), void unget(void *ctx),
            if((nch!=MSVCRT_WEOF) && (nch < '0' || nch > '9')) unget(ctx);
            e *= s;

-            if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN;
-            else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX;
+            if(e<0 && exp<INT_MIN-e) exp = INT_MIN;
+            else if(e>0 && exp>INT_MAX-e) exp = INT_MAX;
            else exp += e;
        } else {
            if(nch != MSVCRT_WEOF) unget(ctx);
@@ -784,8 +784,8 @@ double parse_double(MSVCRT_wchar_t (*get)(void *ctx), void (*unget)(void *ctx),
            if(nch != MSVCRT_WEOF) unget(ctx);
            e *= s;

-            if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN;
-            else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX;
+            if(e<0 && exp<INT_MIN-e) exp = INT_MIN;
+            else if(e>0 && exp>INT_MAX-e) exp = INT_MAX;
            else exp += e;
        } else {
            if(nch != MSVCRT_WEOF) unget(ctx);