Fixed memory leak in error branch of parsestrplus. CID 715374 Variable s going out of scope leaks the storage it points to.

tiran · tiran · commit 10e85ded9bd2 · 2012-09-10T16:53:28.000+02:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -3846,6 +3846,7 @@ parsestrplus(struct compiling *c, const node *n, int *bytesmode)
                 goto onError;
             if (*bytesmode != subbm) {
                 ast_error(c, n, "cannot mix bytes and nonbytes literals");
+                Py_DECREF(s);
                 goto onError;
             }
             if (PyBytes_Check(v) && PyBytes_Check(s)) {

Original file line number	Diff line number	Diff line change
`@@ -3846,6 +3846,7 @@ parsestrplus(struct compiling c, const node n, int *bytesmode)`
`3846`	`3846`	`goto onError;`
`3847`	`3847`	`if (*bytesmode != subbm) {`
`3848`	`3848`	`ast_error(c, n, "cannot mix bytes and nonbytes literals");`
	`3849`	`+ Py_DECREF(s);`
`3849`	`3850`	`goto onError;`
`3850`	`3851`	`}`
`3851`	`3852`	`if (PyBytes_Check(v) && PyBytes_Check(s)) {`