Issue #18408: Fix error handling in PyBytes_FromObject()

vstinner · vstinner · commit 986e224d5a71 · 2013-10-29T03:14:22.000+01:00
_PyBytes_Resize(&amp;new) sets new to NULL on error, don't call Py_DECREF() with NULL.
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -2660,9 +2660,8 @@ PyBytes_FromObject(PyObject *x)
     return new;
 
   error:
-    /* Error handling when new != NULL */
     Py_XDECREF(it);
-    Py_DECREF(new);
+    Py_XDECREF(new);
     return NULL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2660,9 +2660,8 @@ PyBytes_FromObject(PyObject *x)`
`2660`	`2660`	`return new;`
`2661`	`2661`
`2662`	`2662`	`error:`
`2663`		`- /* Error handling when new != NULL */`
`2664`	`2663`	`Py_XDECREF(it);`
`2665`		`- Py_DECREF(new);`
	`2664`	`+ Py_XDECREF(new);`
`2666`	`2665`	`return NULL;`
`2667`	`2666`	`}`
`2668`	`2667`