[PATCH v2] lazymanifest: check more return values in filtercopy

Augie Fackler raf at durin42.com
Wed Jan 6 18:13:53 CST 2016


# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1451586702 18000
#      Thu Dec 31 13:31:42 2015 -0500
# Node ID d1f465b710bca42751366fcf975483aee3593b8d
# Parent  a23cb402be9b9e6812d084f0d30306c826b6d6a4
lazymanifest: check more return values in filtercopy

Spotted by Bryan O'Sullivan (and vexingly not the static analyzer I've
been using.)

diff --git a/mercurial/manifest.c b/mercurial/manifest.c
--- a/mercurial/manifest.c
+++ b/mercurial/manifest.c
@@ -707,11 +707,13 @@ static lazymanifest *lazymanifest_filter
 	copy->pydata = self->pydata;
 	Py_INCREF(self->pydata);
 	for (i = 0; i < self->numlines; i++) {
-		PyObject *arg = PyString_FromString(self->lines[i].start);
-		PyObject *arglist = PyTuple_Pack(1, arg);
-		PyObject *result = PyObject_CallObject(matchfn, arglist);
+		PyObject *arglist = NULL, *result = NULL;
+		arglist = Py_BuildValue("(s)", self->lines[i].start);
+		if (!arglist) {
+			return NULL;
+		}
+		result = PyObject_CallObject(matchfn, arglist);
 		Py_DECREF(arglist);
-		Py_DECREF(arg);
 		/* if the callback raised an exception, just let it
 		 * through and give up */
 		if (!result) {


More information about the Mercurial-devel mailing list