msvcrt: Gets() should handle EOF on stdin gracefully.

Signed-off-by: James Woodcock <james_woodcock@yahoo.co.uk> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Gets() should handle EOF on stdin gracefully.
91c72ce7 · James Woodcock · Alexandre Julliard · 38482b32 · 91c72ce7
Commit 91c72ce7 authored Mar 06, 2018 by James Woodcock Committed by Alexandre Julliard Mar 07, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

file.c dlls/msvcrt/file.c +14 -2

No files found.
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -4719,10 +4719,16 @@ char * CDECL MSVCRT_gets(char *buf)
      if(cc != '\r')
          *buf++ = (char)cc;
  }
+  MSVCRT__unlock_file(MSVCRT_stdin);
+
+  if ((cc == MSVCRT_EOF) && (buf_start == buf))
+  {
+    TRACE(":nothing read\n");
+    return NULL;
+  }
  *buf = '\0';

  TRACE("got '%s'\n", buf_start);
-  MSVCRT__unlock_file(MSVCRT_stdin);
  return buf_start;
 }

@@ -4741,10 +4747,16 @@ MSVCRT_wchar_t* CDECL MSVCRT__getws(MSVCRT_wchar_t* buf)
        if (cc != '\r')
            *buf++ = (MSVCRT_wchar_t)cc;
    }
+    MSVCRT__unlock_file(MSVCRT_stdin);
+
+    if ((cc == MSVCRT_WEOF) && (ws == buf))
+    {
+      TRACE(":nothing read\n");
+      return NULL;
+    }
    *buf = '\0';

    TRACE("got %s\n", debugstr_w(ws));
-    MSVCRT__unlock_file(MSVCRT_stdin);
    return ws;
 }