msvcrt: Fix floating point numbers scanning when null-byte is preceding the number.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48452Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix floating point numbers scanning when null-byte is preceding the number.
287dabd9 · Piotr Caban · Alexandre Julliard · 0aaaacd1 · 287dabd9 · 287dabd9
Commit 287dabd9 authored Jan 13, 2020 by Piotr Caban Committed by Alexandre Julliard Jan 13, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

scanf.h dlls/msvcrt/scanf.h +2 -0

scanf.c dlls/msvcrt/tests/scanf.c +6 -0

No files found.
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -393,6 +393,8 @@ _FUNCTION_ {
                    /* skip initial whitespace */
                    while ((nch!=_EOF_) && _ISSPACE_(nch))
                        nch = _GETC_(file);
+                    if (nch == _EOF_)
+                        break;
                    ctx.unget = nch;
 #ifdef STRING
                    ctx.file = file;

--- a/dlls/msvcrt/tests/scanf.c
+++ b/dlls/msvcrt/tests/scanf.c
@@ -165,6 +165,12 @@ static void test_sscanf( void )
    ok(double_res >= 1.1e-30-1e-45 && double_res <= 1.1e-30+1e-45,
            "Got %.18le, expected %.18le\n", double_res, 1.1e-30);

+    buffer[0] = 0;
+    double_res = 1;
+    ret = p_sscanf(buffer, "%lf", &double_res);
+    ok(ret == -1, "expected 0, got %u\n", ret);
+    ok(double_res == 1, "Got %lf, expected 1\n", double_res);
+
    /* check strings */
    ret = p_sprintf(buffer," %s", pname);
    ok( ret == 26, "expected 26, got %u\n", ret);