PL/Python: Fix remaining scan-build warnings

petere · petere · commit c7f5c58e1c6b · 2017-11-29T09:56:49.000-05:00
Apparently, scan-build thinks that proc-&gt;is_setof can change during
PLy_exec_function().  To make it clearer, save the value in a local
variable.

Also add an assertion to clear another warning.

Reviewed-by: John Naylor &lt;jcnaylor@gmail.com&gt;
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
@@ -57,6 +57,7 @@ static void PLy_abort_open_subtransactions(int save_subxact_level);
 Datum
 PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 {
+	bool		is_setof = proc->is_setof;
 	Datum		rv;
 	PyObject   *volatile plargs = NULL;
 	PyObject   *volatile plrv = NULL;
@@ -73,7 +74,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 
 	PG_TRY();
 	{
-		if (proc->is_setof)
+		if (is_setof)
 		{
 			/* First Call setup */
 			if (SRF_IS_FIRSTCALL())
@@ -93,6 +94,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 			funcctx = SRF_PERCALL_SETUP();
 			Assert(funcctx != NULL);
 			srfstate = (PLySRFState *) funcctx->user_fctx;
+			Assert(srfstate != NULL);
 		}
 
 		if (srfstate == NULL || srfstate->iter == NULL)
@@ -125,7 +127,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 		 * We stay in the SPI context while doing this, because PyIter_Next()
 		 * calls back into Python code which might contain SPI calls.
 		 */
-		if (proc->is_setof)
+		if (is_setof)
 		{
 			if (srfstate->iter == NULL)
 			{

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ static void PLy_abort_open_subtransactions(int save_subxact_level);`
`57`	`57`	`Datum`
`58`	`58`	`PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`59`	`59`	`{`
	`60`	`+ bool is_setof = proc->is_setof;`
`60`	`61`	`Datum rv;`
`61`	`62`	`PyObject *volatile plargs = NULL;`
`62`	`63`	`PyObject *volatile plrv = NULL;`
`@@ -73,7 +74,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`73`	`74`
`74`	`75`	`PG_TRY();`
`75`	`76`	`{`
`76`		`- if (proc->is_setof)`
	`77`	`+ if (is_setof)`
`77`	`78`	`{`
`78`	`79`	`/* First Call setup */`
`79`	`80`	`if (SRF_IS_FIRSTCALL())`
`@@ -93,6 +94,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`93`	`94`	`funcctx = SRF_PERCALL_SETUP();`
`94`	`95`	`Assert(funcctx != NULL);`
`95`	`96`	`srfstate = (PLySRFState *) funcctx->user_fctx;`
	`97`	`+ Assert(srfstate != NULL);`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`if (srfstate == NULL \|\| srfstate->iter == NULL)`
`@@ -125,7 +127,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)`
`125`	`127`	`* We stay in the SPI context while doing this, because PyIter_Next()`
`126`	`128`	`* calls back into Python code which might contain SPI calls.`
`127`	`129`	`*/`
`128`		`- if (proc->is_setof)`
	`130`	`+ if (is_setof)`
`129`	`131`	`{`
`130`	`132`	`if (srfstate->iter == NULL)`
`131`	`133`	`{`