Consistently catch errors from Python _New() functions

petere · petere · commit d0aa965c0a0a · 2017-11-18T13:39:53.000-05:00
Python Py*_New() functions can fail and return NULL in out-of-memory
conditions.  The previous code handled that inconsistently or not at
all.  This change organizes that better.  If we are in a function that
is called from Python, we just check for failure and return NULL
ourselves, which will cause any exception information to be passed up.
If we are called from PostgreSQL, we consistently create an "out of
memory" error.

Reviewed-by: Tom Lane &lt;tgl@sss.pgh.pa.us&gt;
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
@@ -93,6 +93,10 @@ hstore_to_plpython(PG_FUNCTION_ARGS)
 	PyObject   *dict;
 
 	dict = PyDict_New();
+	if (!dict)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
 
 	for (i = 0; i < count; i++)
 	{
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
@@ -46,6 +46,10 @@ ltree_to_plpython(PG_FUNCTION_ARGS)
 	ltree_level *curlevel;
 
 	list = PyList_New(in->numlevel);
+	if (!list)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
 
 	curlevel = LTREE_FIRST(in);
 	for (i = 0; i < in->numlevel; i++)
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
@@ -457,17 +457,24 @@ PLy_cursor_fetch(PyObject *self, PyObject *args)
 
 			Py_DECREF(ret->rows);
 			ret->rows = PyList_New(SPI_processed);
-
-			PLy_input_setup_tuple(&cursor->result, SPI_tuptable->tupdesc,
-								  exec_ctx->curr_proc);
-
-			for (i = 0; i < SPI_processed; i++)
+			if (!ret->rows)
 			{
-				PyObject   *row = PLy_input_from_tuple(&cursor->result,
-													   SPI_tuptable->vals[i],
-													   SPI_tuptable->tupdesc);
+				Py_DECREF(ret);
+				ret = NULL;
+			}
+			else
+			{
+				PLy_input_setup_tuple(&cursor->result, SPI_tuptable->tupdesc,
+									  exec_ctx->curr_proc);
+
+				for (i = 0; i < SPI_processed; i++)
+				{
+					PyObject   *row = PLy_input_from_tuple(&cursor->result,
+														   SPI_tuptable->vals[i],
+														   SPI_tuptable->tupdesc);
 
-				PyList_SetItem(ret->rows, i, row);
+					PyList_SetItem(ret->rows, i, row);
+				}
 			}
 		}
 
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
@@ -420,6 +420,9 @@ PLy_function_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc)
 	PG_TRY();
 	{
 		args = PyList_New(proc->nargs);
+		if (!args)
+			return NULL;
+
 		for (i = 0; i < proc->nargs; i++)
 		{
 			PLyDatumToOb *arginfo = &proc->args[i];
@@ -693,7 +696,7 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 	{
 		pltdata = PyDict_New();
 		if (!pltdata)
-			PLy_elog(ERROR, "could not create new dictionary while building trigger arguments");
+			return NULL;
 
 		pltname = PyString_FromString(tdata->tg_trigger->tgname);
 		PyDict_SetItemString(pltdata, "name", pltname);
@@ -826,6 +829,11 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 			PyObject   *pltarg;
 
 			pltargs = PyList_New(tdata->tg_trigger->tgnargs);
+			if (!pltargs)
+			{
+				Py_DECREF(pltdata);
+				return NULL;
+			}
 			for (i = 0; i < tdata->tg_trigger->tgnargs; i++)
 			{
 				pltarg = PyString_FromString(tdata->tg_trigger->tgargs[i]);
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
@@ -167,7 +167,7 @@ PLy_init_interp(void)
 	PLy_interp_globals = PyModule_GetDict(mainmod);
 	PLy_interp_safe_globals = PyDict_New();
 	if (PLy_interp_safe_globals == NULL)
-		PLy_elog(ERROR, "could not create globals");
+		PLy_elog(ERROR, NULL);
 	PyDict_SetItemString(PLy_interp_globals, "GD", PLy_interp_safe_globals);
 	Py_DECREF(mainmod);
 	if (PLy_interp_globals == NULL || PyErr_Occurred())
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
@@ -233,7 +233,7 @@ PLy_create_exception(char *name, PyObject *base, PyObject *dict,
 
 	exc = PyErr_NewException(name, base, dict);
 	if (exc == NULL)
-		PLy_elog(ERROR, "could not create exception \"%s\"", name);
+		PLy_elog(ERROR, NULL);
 
 	/*
 	 * PyModule_AddObject does not add a refcount to the object, for some odd
@@ -268,7 +268,7 @@ PLy_generate_spi_exceptions(PyObject *mod, PyObject *base)
 		PyObject   *dict = PyDict_New();
 
 		if (dict == NULL)
-			PLy_elog(ERROR, "could not generate SPI exceptions");
+			PLy_elog(ERROR, NULL);
 
 		sqlstate = PyString_FromString(unpack_sql_state(exception_map[i].sqlstate));
 		if (sqlstate == NULL)
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
@@ -368,6 +368,8 @@ PLy_procedure_compile(PLyProcedure *proc, const char *src)
 	 * all functions
 	 */
 	proc->statics = PyDict_New();
+	if (!proc->statics)
+		PLy_elog(ERROR, NULL);
 	PyDict_SetItemString(proc->globals, "SD", proc->statics);
 
 	/*
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
@@ -112,6 +112,11 @@ PLy_result_new(void)
 	ob->nrows = PyInt_FromLong(-1);
 	ob->rows = PyList_New(0);
 	ob->tupdesc = NULL;
+	if (!ob->rows)
+	{
+		Py_DECREF(ob);
+		return NULL;
+	}
 
 	return (PyObject *) ob;
 }
@@ -147,6 +152,8 @@ PLy_result_colnames(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
 	{
 		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
@@ -171,6 +178,8 @@ PLy_result_coltypes(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
 	{
 		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
@@ -195,6 +204,8 @@ PLy_result_coltypmods(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
 	{
 		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
@@ -360,6 +360,8 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 	volatile MemoryContext oldcontext;
 
 	result = (PLyResultObject *) PLy_result_new();
+	if (!result)
+		return NULL;
 	Py_DECREF(result->status);
 	result->status = PyInt_FromLong(status);
 
@@ -409,17 +411,24 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 
 				Py_DECREF(result->rows);
 				result->rows = PyList_New(rows);
-
-				PLy_input_setup_tuple(&ininfo, tuptable->tupdesc,
-									  exec_ctx->curr_proc);
-
-				for (i = 0; i < rows; i++)
+				if (!result->rows)
 				{
-					PyObject   *row = PLy_input_from_tuple(&ininfo,
-														   tuptable->vals[i],
-														   tuptable->tupdesc);
+					Py_DECREF(result);
+					result = NULL;
+				}
+				else
+				{
+					PLy_input_setup_tuple(&ininfo, tuptable->tupdesc,
+										  exec_ctx->curr_proc);
+
+					for (i = 0; i < rows; i++)
+					{
+						PyObject   *row = PLy_input_from_tuple(&ininfo,
+															   tuptable->vals[i],
+															   tuptable->tupdesc);
 
-					PyList_SetItem(result->rows, i, row);
+						PyList_SetItem(result->rows, i, row);
+					}
 				}
 			}
 
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
@@ -718,6 +718,8 @@ PLyList_FromArray_recurse(PLyDatumToOb *elm, int *dims, int ndim, int dim,
 	PyObject   *list;
 
 	list = PyList_New(dims[dim]);
+	if (!list)
+		return NULL;
 
 	if (dim < ndim - 1)
 	{
@@ -826,7 +828,7 @@ PLyDict_FromTuple(PLyDatumToOb *arg, HeapTuple tuple, TupleDesc desc)
 
 	dict = PyDict_New();
 	if (dict == NULL)
-		PLy_elog(ERROR, "could not create new dictionary");
+		return NULL;
 
 	PG_TRY();
 	{

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,10 @@ hstore_to_plpython(PG_FUNCTION_ARGS)`
`93`	`93`	`PyObject *dict;`
`94`	`94`
`95`	`95`	`dict = PyDict_New();`
	`96`	`+ if (!dict)`
	`97`	`+ ereport(ERROR,`
	`98`	`+ (errcode(ERRCODE_OUT_OF_MEMORY),`
	`99`	`+ errmsg("out of memory")));`
`96`	`100`
`97`	`101`	`for (i = 0; i < count; i++)`
`98`	`102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,11 @@ PLy_result_new(void)`
`112`	`112`	`ob->nrows = PyInt_FromLong(-1);`
`113`	`113`	`ob->rows = PyList_New(0);`
`114`	`114`	`ob->tupdesc = NULL;`
	`115`	`+ if (!ob->rows)`
	`116`	`+ {`
	`117`	`+ Py_DECREF(ob);`
	`118`	`+ return NULL;`
	`119`	`+ }`
`115`	`120`
`116`	`121`	`return (PyObject *) ob;`
`117`	`122`	`}`
`@@ -147,6 +152,8 @@ PLy_result_colnames(PyObject self, PyObject unused)`
`147`	`152`	`}`
`148`	`153`
`149`	`154`	`list = PyList_New(ob->tupdesc->natts);`
	`155`	`+ if (!list)`
	`156`	`+ return NULL;`
`150`	`157`	`for (i = 0; i < ob->tupdesc->natts; i++)`
`151`	`158`	`{`
`152`	`159`	`Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);`
`@@ -171,6 +178,8 @@ PLy_result_coltypes(PyObject self, PyObject unused)`
`171`	`178`	`}`
`172`	`179`
`173`	`180`	`list = PyList_New(ob->tupdesc->natts);`
	`181`	`+ if (!list)`
	`182`	`+ return NULL;`
`174`	`183`	`for (i = 0; i < ob->tupdesc->natts; i++)`
`175`	`184`	`{`
`176`	`185`	`Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);`
`@@ -195,6 +204,8 @@ PLy_result_coltypmods(PyObject self, PyObject unused)`
`195`	`204`	`}`
`196`	`205`
`197`	`206`	`list = PyList_New(ob->tupdesc->natts);`
	`207`	`+ if (!list)`
	`208`	`+ return NULL;`
`198`	`209`	`for (i = 0; i < ob->tupdesc->natts; i++)`
`199`	`210`	`{`
`200`	`211`	`Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);`
Original file line number	Diff line number	Diff line change
`@@ -718,6 +718,8 @@ PLyList_FromArray_recurse(PLyDatumToOb elm, int dims, int ndim, int dim,`
`718`	`718`	`PyObject *list;`
`719`	`719`
`720`	`720`	`list = PyList_New(dims[dim]);`
	`721`	`+ if (!list)`
	`722`	`+ return NULL;`
`721`	`723`
`722`	`724`	`if (dim < ndim - 1)`
`723`	`725`	`{`
`@@ -826,7 +828,7 @@ PLyDict_FromTuple(PLyDatumToOb *arg, HeapTuple tuple, TupleDesc desc)`
`826`	`828`
`827`	`829`	`dict = PyDict_New();`
`828`	`830`	`if (dict == NULL)`
`829`		`- PLy_elog(ERROR, "could not create new dictionary");`
	`831`	`+ return NULL;`
`830`	`832`
`831`	`833`	`PG_TRY();`
`832`	`834`	`{`