mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

PL/Python: Fix remaining scan-build warnings

Browse Source 
Apparently, scan-build thinks that proc->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 <jcnaylor@gmail.com>
This commit is contained in:
Peter Eisentraut 2017-08-22 20:05:49 -04:00
parent cdddd5d40b
commit c7f5c58e1c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pl/plpython/plpy_exec.c
View File

@ -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)
{