Use PyErr_Format() in decoding_fgets()

Victor Stinner · Victor Stinner · commit 003a5e702bcc · 2010-04-28T17:06:46.000Z
Avoid a buffer of 500 bytes allocated on the stack.
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
@@ -580,16 +580,14 @@ decoding_fgets(char *s, int size, struct tok_state *tok)
 			}
 	}
 	if (badchar) {
-		char buf[500];
 		/* Need to add 1 to the line number, since this line
 		   has not been counted, yet.  */
-		sprintf(buf,
+		PyErr_Format(PyExc_SyntaxError,
 			"Non-UTF-8 code starting with '\\x%.2x' "
 			"in file %.200s on line %i, "
 			"but no encoding declared; "
 			"see http://python.org/dev/peps/pep-0263/ for details",
 			badchar, tok->filename, tok->lineno + 1);
-		PyErr_SetString(PyExc_SyntaxError, buf);
 		return error_ret(tok);
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -580,16 +580,14 @@ decoding_fgets(char s, int size, struct tok_state tok)`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`	`if (badchar) {`
`583`		`- char buf[500];`
`584`	`583`	`/* Need to add 1 to the line number, since this line`
`585`	`584`	`has not been counted, yet. */`
`586`		`- sprintf(buf,`
	`585`	`+ PyErr_Format(PyExc_SyntaxError,`
`587`	`586`	`"Non-UTF-8 code starting with '\\x%.2x' "`
`588`	`587`	`"in file %.200s on line %i, "`
`589`	`588`	`"but no encoding declared; "`
`590`	`589`	`"see http://python.org/dev/peps/pep-0263/ for details",`
`591`	`590`	`badchar, tok->filename, tok->lineno + 1);`
`592`		`- PyErr_SetString(PyExc_SyntaxError, buf);`
`593`	`591`	`return error_ret(tok);`
`594`	`592`	`}`
`595`	`593`	`#endif`