Merge pull request #1648 from stweil/fix

scanutils: Fix illegal memory access
tesseract-ocr · Jun 8, 2018 · 89730e1 · 89730e1
2 parents a662306 + 280db06
commit 89730e1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/ccutil/scanutils.cpp b/src/ccutil/scanutils.cpp
@@ -472,8 +472,10 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
 
             case 's':               // String
             {
-              char *sp;
-              sp = sarg = va_arg(ap, char *);
+              if (!(flags & FL_SPLAT)) {
+                sarg = va_arg(ap, char *);
+              }
+              char *sp = sarg;
               while (width--) {
                 q = fgetc(stream);
                 if (isspace(static_cast<unsigned char>(q)) || q <= 0) {
@@ -488,7 +490,6 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
               } else if (!(flags & FL_SPLAT)) {
                 *sp = '\0'; // Terminate output
                 converted++;
-              } else {
               }
             }
             break;