Klocwork made another run and found a bunch more problems.

neal.norwitz · neal.norwitz · commit 8d475adc91bc · 2006-08-12T01:43:40.000Z
This is the first batch of fixes that should be easy to verify based on context. This fixes problem numbers: 220 (ast), 323-324 (symtable), 321-322 (structseq), 215 (array), 210 (hotshot), 182 (codecs), 209 (etree). git-svn-id: http://svn.python.org/projects/python/trunk@51218 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/README.klocwork b/Misc/README.klocwork
@@ -23,4 +23,8 @@ in addition to any analysis.
 False positives were also annotated so that the comments can
 be reviewed and reversed if the analysis was incorrect.
 
+A second run was performed on 10-Aug-2006.  The tool was tuned to remove
+some false positives and perform some additional checks.  ~150 new
+warnings were produced, primarily related to dereferencing NULL pointers.
+
 Contact python-dev@python.org for more information.
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
@@ -192,7 +192,8 @@ escape_encode(PyObject *self,
 	buf = PyString_AS_STRING (str);
 	len = PyString_GET_SIZE (str);
 	memmove(buf, buf+1, len-2);
-	_PyString_Resize(&str, len-2);
+	if (_PyString_Resize(&str, len-2) < 0)
+		return NULL;
 	
 	return codec_tuple(str, PyString_Size(str));
 }
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
@@ -809,7 +809,7 @@ element_findtext(ElementObject* self, PyObject* args)
             PyObject* text = element_get_text(item);
             if (text == Py_None)
                 return PyString_FromString("");
-            Py_INCREF(text);
+            Py_XINCREF(text);
             return text;
         }
     }
diff --git a/Modules/_hotshot.c b/Modules/_hotshot.c
@@ -313,6 +313,11 @@ unpack_string(LogReaderObject *self, PyObject **pvalue)
         return err;
 
     buf = (char *)malloc(len);
+    if (!buf) {
+	PyErr_NoMemory();
+	return ERR_EXCEPTION;
+    }
+
     for (i=0; i < len; i++) {
         ch = fgetc(self->logfp);
 	buf[i] = ch;
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -702,6 +702,8 @@ array_ass_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject *v)
 			/* Special case "a[i:j] = a" -- copy b first */
 			int ret;
 			v = array_slice(b, 0, n);
+			if (!v)
+				return -1;
 			ret = array_ass_slice(a, ilow, ihigh, v);
 			Py_DECREF(v);
 			return ret;
@@ -1708,6 +1710,8 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
 			if (self == av) { 
 				value = array_slice(av, 0, av->ob_size);
 				av = (arrayobject*)value;
+				if (!av)
+					return -1;
 			} 
 			else {
 				Py_INCREF(value);
diff --git a/Objects/structseq.c b/Objects/structseq.c
@@ -215,6 +215,8 @@ structseq_contains(PyStructSequence *obj, PyObject *o)
 	PyObject *tup;
 	int result;
 	tup = make_tuple(obj);
+	if (!tup)
+		return -1;
 	result = PySequence_Contains(tup, o);
 	Py_DECREF(tup);
 	return result;
@@ -226,6 +228,8 @@ structseq_hash(PyObject *obj)
 	PyObject *tup;
 	long result;
 	tup = make_tuple((PyStructSequence*) obj);
+	if (!tup)
+		return -1;
 	result = PyObject_Hash(tup);
 	Py_DECREF(tup);
 	return result;
diff --git a/Python/ast.c b/Python/ast.c
@@ -2197,6 +2197,8 @@ alias_for_import_name(struct compiling *c, const node *n)
             }
             else {
                 alias_ty a = alias_for_import_name(c, CHILD(n, 0));
+                if (!a)
+                    return NULL;
                 if (strcmp(STR(CHILD(n, 1)), "as") != 0) {
                     ast_error(n, "must use 'as' in import");
                     return NULL;
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -915,6 +915,8 @@ symtable_new_tmpname(struct symtable *st)
 	PyOS_snprintf(tmpname, sizeof(tmpname), "_[%d]",
 		      ++st->st_cur->ste_tmpname);
 	tmp = PyString_InternFromString(tmpname);
+	if (!tmp)
+		return 0;
 	if (!symtable_add_def(st, tmp, DEF_LOCAL))
 		return 0;
 	Py_DECREF(tmp);
@@ -1323,8 +1325,11 @@ symtable_visit_alias(struct symtable *st, alias_ty a)
 	PyObject *name = (a->asname == NULL) ? a->name : a->asname;
 	const char *base = PyString_AS_STRING(name);
 	char *dot = strchr(base, '.');
-	if (dot)
+	if (dot) {
 		store_name = PyString_FromStringAndSize(base, dot - base);
+		if (!store_name)
+			return 0;
+	}
 	else {
 		store_name = name;
 		Py_INCREF(store_name);

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,8 @@ escape_encode(PyObject *self,`
`192`	`192`	`buf = PyString_AS_STRING (str);`
`193`	`193`	`len = PyString_GET_SIZE (str);`
`194`	`194`	`memmove(buf, buf+1, len-2);`
`195`		`- _PyString_Resize(&str, len-2);`
	`195`	`+ if (_PyString_Resize(&str, len-2) < 0)`
	`196`	`+ return NULL;`
`196`	`197`
`197`	`198`	`return codec_tuple(str, PyString_Size(str));`
`198`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ element_findtext(ElementObject* self, PyObject* args)`
`809`	`809`	`PyObject* text = element_get_text(item);`
`810`	`810`	`if (text == Py_None)`
`811`	`811`	`return PyString_FromString("");`
`812`		`- Py_INCREF(text);`
	`812`	`+ Py_XINCREF(text);`
`813`	`813`	`return text;`
`814`	`814`	`}`
`815`	`815`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2197,6 +2197,8 @@ alias_for_import_name(struct compiling c, const node n)`
`2197`	`2197`	`}`
`2198`	`2198`	`else {`
`2199`	`2199`	`alias_ty a = alias_for_import_name(c, CHILD(n, 0));`
	`2200`	`+ if (!a)`
	`2201`	`+ return NULL;`
`2200`	`2202`	`if (strcmp(STR(CHILD(n, 1)), "as") != 0) {`
`2201`	`2203`	`ast_error(n, "must use 'as' in import");`
`2202`	`2204`	`return NULL;`