msvcrt: Fix scanf with dashes in scanset.

Signed-off-by: Will Mainio <will.mainio@fastmail.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Fix scanf with dashes in scanset.
c38102b9 · Will Mainio · Alexandre Julliard · 12bc7c0a · c38102b9
Commit c38102b9 authored Nov 02, 2020 by Will Mainio Committed by Alexandre Julliard Nov 02, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

scanf.h dlls/msvcrt/scanf.h +6 -6

No files found.
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -639,12 +639,12 @@ _FUNCTION_ {
                    while(*format && (*format != ']')) {
 			/* According to msdn:
 			 * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */
-			if((*format == '-') && (*(format + 1) != ']')) {
-			    if ((*(format - 1)) < *(format + 1))
-				RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1));
-			    else
-				RtlSetBits(&bitMask, *(format + 1)    , *(format - 1) - *(format + 1));			      
-			    format++;
+                        if(format[1] == '-' && format[2] && format[2] != ']') {
+                            if (format[0] < format[2])
+                                RtlSetBits(&bitMask, format[0], format[2] - format[0] + 1);
+                            else
+                                RtlSetBits(&bitMask, format[2], format[0] - format[2] + 1);
+			    format += 2;
 			} else
 			    RtlSetBits(&bitMask, *format, 1);
 			format++;