about summary refs log tree commit diff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index c7ea4bb5e0..dd635c9f34 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -724,13 +724,13 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 
 	  while ((fc = *f++) != '\0' && fc != ']')
 	    {
-	      if (*f == '-' && f[1] != '\0' && f[1] != ']' && fc <= f[1])
+	      if (fc == '-' && *f != '\0' && *f != ']' &&
+		  (unsigned char) f[-2] <= (unsigned char) *f)
 		{
 		  /* Add all characters from the one before the '-'
 		     up to (but not including) the next format char.  */
-		  f++;
-		  while (fc < *f)
-		    wp[fc++] = 1;
+		  for (fc = f[-2]; fc < *f; ++fc)
+		    wp[fc] = 1;
 		}
 	      else
 		/* Add the character to the flag map.  */