Don't Py_DECREF NULL variable in io.IncrementalNewlineDecoder.

rosslagerwall · rosslagerwall · commit 0f9eec19ee16 · 2012-04-07T07:09:57.000+02:00
Found with Clang's Static Analyzer.
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -19,6 +19,8 @@ Core and Builtins
 Library
 -------
 
+- Don't Py_DECREF NULL variable in io.IncrementalNewlineDecoder.
+
 - Issue #8515: Set __file__ when run file in IDLE.
   Initial patch by Bruce Frederiksen.
 
diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c
@@ -460,7 +460,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *_self,
             output = PyUnicode_FromKindAndData(kind, translated, out);
             PyMem_Free(translated);
             if (!output)
-                goto error;
+                return NULL;
         }
         self->seennl |= seennl;
     }

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ _PyIncrementalNewlineDecoder_decode(PyObject *_self,`
`460`	`460`	`output = PyUnicode_FromKindAndData(kind, translated, out);`
`461`	`461`	`PyMem_Free(translated);`
`462`	`462`	`if (!output)`
`463`		`- goto error;`
	`463`	`+ return NULL;`
`464`	`464`	`}`
`465`	`465`	`self->seennl \|= seennl;`
`466`	`466`	`}`