[CRT]

- Import commit 638c8e38 (Don't overwrite unmatched string in scanf) from Wine. Fixes crash in msvcrt_winetest:scanf

svn path=/trunk/; revision=62971

diff --git a/reactos/lib/sdk/crt/string/scanf.h b/reactos/lib/sdk/crt/string/scanf.h
index 69ca719..4aada82 100644 (file)
--- a/reactos/lib/sdk/crt/string/scanf.h
+++ b/reactos/lib/sdk/crt/string/scanf.h
@@ -359,7 +359,7 @@ _FUNCTION_ {
                        if (width>0) width--;
                     }
                     /* terminate */
-                    if (!suppress) *sptr = 0;
+                    if (st && !suppress) *sptr = 0;
                 }
                 break;
            widecharstring: { /* read a word into a wchar_t* */
@@ -375,7 +375,7 @@ _FUNCTION_ {
                        if (width>0) width--;
                     }
                     /* terminate */
-                    if (!suppress) *sptr = 0;
+                    if (st && !suppress) *sptr = 0;
                 }
                 break;
             /* 'c' and 'C work analogously to 's' and 'S' as described