Mercurial > cpython-lru_cache-weakref

diff Objects/object.c @ 36978:4808ee62b156 2.4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backport 43022: Fix and test (manually w/xx module) passing NULLs to PyObject_Str() and PyObject_Unicode(). This problem was originally reported from Coverity and addresses mail on python-dev "checkin r43015". This inlines the conversion of the string to unicode and cleans up/simplifies some code at the end of the PyObject_Unicode(). We really need a complete C API test module for all public APIs and passing good and bad parameter values.
author Neal Norwitz <nnorwitz@gmail.com>
date Tue, 14 Mar 2006 06:10:22 +0000
parents 8c1bf799952c
children bc4fbbb2db30
line wrap: on
line diff
--- a/Objects/object.c	Mon Mar 13 22:22:15 2006 +0000
+++ b/Objects/object.c	Tue Mar 14 06:10:22 2006 +0000
@@ -373,9 +373,15 @@
 PyObject_Unicode(PyObject *v)
 {
 	PyObject *res;
+	PyObject *str;
 
 	if (v == NULL) {
 		res = PyString_FromString("<NULL>");
+		if (res == NULL)
+			return NULL;
+		str = PyUnicode_FromEncodedObject(res, NULL, "strict");
+		Py_DECREF(res);
+		return str;
 	} else if (PyUnicode_CheckExact(v)) {
 		Py_INCREF(v);
 		return v;
@@ -418,13 +424,9 @@
 	if (res == NULL)
 		return NULL;
 	if (!PyUnicode_Check(res)) {
-		PyObject *str;
 		str = PyUnicode_FromEncodedObject(res, NULL, "strict");
 		Py_DECREF(res);
-		if (str)
-			res = str;
-		else
-		    	return NULL;
+		res = str;
 	}
 	return res;
 }