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 3d463393bb06 · 2012-09-10T16:52:42.000+02:00
diff --git a/Python/ast.c b/Python/ast.c
@@ -3395,6 +3395,7 @@ parsestrplus(struct compiling *c, const node *n, int *bytesmode)
                 goto onError;
             if (*bytesmode != subbm) {
                 ast_error(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
`@@ -3395,6 +3395,7 @@ parsestrplus(struct compiling c, const node n, int *bytesmode)`
`3395`	`3395`	`goto onError;`
`3396`	`3396`	`if (*bytesmode != subbm) {`
`3397`	`3397`	`ast_error(n, "cannot mix bytes and nonbytes literals");`
	`3398`	`+ Py_DECREF(s);`
`3398`	`3399`	`goto onError;`
`3399`	`3400`	`}`
`3400`	`3401`	`if (PyBytes_Check(v) && PyBytes_Check(s)) {`