summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2012-04-07 05:09:57 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2012-04-07 05:09:57 (GMT)
commit0f9eec19ee1652a61d4b2e860e599c617d88b707 (patch)
treed6c3b4dd4e5831d0f620d2a96f8f3c324781f7fc
parentc1b34a36f81d6fad6474e51f569f82c39e89d1c0 (diff)
downloadcpython-0f9eec19ee1652a61d4b2e860e599c617d88b707.zip
cpython-0f9eec19ee1652a61d4b2e860e599c617d88b707.tar.gz
cpython-0f9eec19ee1652a61d4b2e860e599c617d88b707.tar.bz2
Don't Py_DECREF NULL variable in io.IncrementalNewlineDecoder.
Found with Clang's Static Analyzer.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_io/textio.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b4a0091..29bf33a 100644
--- 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
index 833a527..ae105e5 100644
--- 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;
}