Issue python#23055: Fixed read-past-the-end error in PyUnicode_FromFormatV.

serhiy-storchaka · serhiy-storchaka · commit aed198426a3b · 2015-01-31T01:15:48.000+02:00
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -762,6 +762,8 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)
              f++;
              while (*f && *f != '%' && !Py_ISALPHA((unsigned)*f))
                  f++;
+             if (!*f)
+                 break;
              if (*f == 's' || *f=='S' || *f=='R' || *f=='A' || *f=='V')
                  ++callcount;
          }

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,8 @@ PyUnicode_FromFormatV(const char *format, va_list vargs)`
`762`	`762`	`f++;`
`763`	`763`	`while (f && f != '%' && !Py_ISALPHA((unsigned)*f))`
`764`	`764`	`f++;`
	`765`	`+ if (!*f)`
	`766`	`+ break;`
`765`	`767`	`if (f == 's' \|\| f=='S' \|\| f=='R' \|\| f=='A' \|\| *f=='V')`
`766`	`768`	`++callcount;`
`767`	`769`	`}`