diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-23 05:39:47 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-03-23 05:39:47 (GMT) |
| commit | e98ccf66902f10ce2daaa33a22fb8ee8d99de18f (patch) | |
| tree | 41e520b10ee42e64e198c6aef48c3f397f1d7e13 /Python | |
| parent | 4d073bb9a1f72383e0ba78356a09c3799b41add6 (diff) | |
| download | cpython-e98ccf66902f10ce2daaa33a22fb8ee8d99de18f.zip cpython-e98ccf66902f10ce2daaa33a22fb8ee8d99de18f.tar.gz cpython-e98ccf66902f10ce2daaa33a22fb8ee8d99de18f.tar.bz2 | |
Forward port MvL's fix in 43227:
Fix crash when a Unicode string containing an encoding declaration is
compile()d. Fixes #1115379.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ast.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/ast.c b/Python/ast.c index 3c339f0..30275a6 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -191,6 +191,10 @@ PyAST_FromNode(const node *n, PyCompilerFlags *flags, const char *filename, if (flags && flags->cf_flags & PyCF_SOURCE_IS_UTF8) { c.c_encoding = "utf-8"; + if (TYPE(n) == encoding_decl) { + ast_error(n, "encoding declaration in Unicode string"); + goto error; + } } else if (TYPE(n) == encoding_decl) { c.c_encoding = STR(n); n = CHILD(n, 0); |