From: Peter Eisentraut <peter_e@gmx.net>
Date: Wed, 25 Aug 2010 19:37:39 +0000 (+0000)
Subject: Catch null pointer returns from PyCObject_AsVoidPtr and PyCObject_FromVoidPtr
X-Git-Tag: REL8_2_18~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b64f3bcf726ab945ff9431322f8ebbea51366eef;p=thirdparty%2Fpostgresql.git

Catch null pointer returns from PyCObject_AsVoidPtr and PyCObject_FromVoidPtr

This is reproducibly possible in Python 2.7 if the user turned
PendingDeprecationWarning into an error, but it's theoretically also possible
in earlier versions in case of exceptional conditions.

backpatched to 8.0
---

diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c
index 58c02001d9a..63ad15e7afa 100644
--- a/src/pl/plpython/plpython.c
+++ b/src/pl/plpython/plpython.c
@@ -1,7 +1,7 @@
 /**********************************************************************
  * plpython.c - python as a procedural language for PostgreSQL
  *
- *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.90.2.7 2010/04/30 19:16:04 tgl Exp $
+ *	$PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.90.2.8 2010/08/25 19:37:39 petere Exp $
  *
  *********************************************************************
  */
@@ -1099,6 +1099,8 @@ PLy_procedure_get(FunctionCallInfo fcinfo, Oid tgreloid)
 			elog(FATAL, "expected a PyCObject, didn't get one");
 
 		proc = PyCObject_AsVoidPtr(plproc);
+		if (!proc)
+			PLy_elog(ERROR, "PyCObject_AsVoidPtr() failed");
 		if (proc->me != plproc)
 			elog(FATAL, "proc->me != plproc");
 		/* did we find an up-to-date cache entry? */
@@ -1301,8 +1303,11 @@ PLy_procedure_create(HeapTuple procTup, Oid tgreloid, char *key)
 		PLy_procedure_compile(proc, procSource);
 
 		pfree(procSource);
+		procSource = NULL;
 
 		proc->me = PyCObject_FromVoidPtr(proc, NULL);
+		if (!proc->me)
+			PLy_elog(ERROR, "PyCObject_FromVoidPtr() failed");
 		PyDict_SetItemString(PLy_procedure_cache, key, proc->me);
 	}
 	PG_CATCH();