Piotr Caban : msvcrt: Update consumed in all scanf variants on end of input.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1366dd69d5a0578299dc69365db972b0341456d2
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1366dd69d5a0578299dc69365db972b0341456d2

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Fri Jan  3 19:42:07 2020 +0100

msvcrt: Update consumed in all scanf variants on end of input.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/scanf.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h
index 5f88839c91..934bd95953 100644
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -79,9 +79,9 @@
 #endif
 #ifdef STRING_LEN
 #ifdef WIDE_SCANF
-#define _GETC_(file) (consumed==length ? '\0' : (consumed++, *file++))
+#define _GETC_(file) (consumed++, consumed>length ? '\0' : *file++)
 #else /* WIDE_SCANF */
-#define _GETC_(file) (consumed==length ? '\0' : (consumed++, (unsigned char)*file++))
+#define _GETC_(file) (consumed++, consumed>length ? '\0' : (unsigned char)*file++)
 #endif /* WIDE_SCANF */
 #define _UNGETC_(nch, file) do { file--; consumed--; } while(0)
 #define _LOCK_FILE_(file) do {} while(0)