commit e98ccf66902f10ce2daaa33a22fb8ee8d99de18f
author Neal Norwitz <nnorwitz@gmail.com> Thu Mar 23 05:39:47 2006 +0000
committer Neal Norwitz <nnorwitz@gmail.com> Thu Mar 23 05:39:47 2006 +0000
tree 41e520b10ee42e64e198c6aef48c3f397f1d7e13
parent 4d073bb9a1f72383e0ba78356a09c3799b41add6

Forward port MvL's fix in 43227:

Fix crash when a Unicode string containing an encoding declaration is
compile()d. Fixes #1115379.

Python/ast.c

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 @@
 
     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);