mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Volatile-ize all five places where we expect a PG_TRY block to restore

Browse Source 
old memory context in plpython.  Before only one of them was marked
volatile, but per report from Zdenek Kotala, some compilers do the
wrong thing here.
This commit is contained in:
Tom Lane 2010-02-18 23:50:27 +00:00
parent f9aa8763e2
commit aff66ef113
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pl/plpython/plpython.c
View File

@ -1,7 +1,7 @@
/********************************************************************** /**********************************************************************
* plpython.c - python as a procedural language for PostgreSQL * plpython.c - python as a procedural language for PostgreSQL
* *
* $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.90.2.5 2009/11/03 08:29:51 petere Exp $ * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.90.2.6 2010/02/18 23:50:27 tgl Exp $
* *
********************************************************************* *********************************************************************
*/ */
@ -2273,7 +2273,7 @@ PLy_spi_prepare(PyObject * self, PyObject * args)
PyObject *volatile optr = NULL; PyObject *volatile optr = NULL;
char *query; char *query;
void *tmpplan; void *tmpplan;
MemoryContext oldcontext; volatile MemoryContext oldcontext;
/* Can't execute more if we have an unhandled error */ /* Can't execute more if we have an unhandled error */
if (PLy_error_in_progress) if (PLy_error_in_progress)
@ -2431,7 +2431,7 @@ PLy_spi_execute_plan(PyObject * ob, PyObject * list, long limit)
int i, int i,
rv; rv;
PLyPlanObject *plan; PLyPlanObject *plan;
MemoryContext oldcontext; volatile MemoryContext oldcontext;
if (list != NULL) if (list != NULL)
{ {
@ -2579,7 +2579,7 @@ static PyObject *
PLy_spi_execute_query(char *query, long limit) PLy_spi_execute_query(char *query, long limit)
{ {
int rv; int rv;
MemoryContext oldcontext; volatile MemoryContext oldcontext;
oldcontext = CurrentMemoryContext; oldcontext = CurrentMemoryContext;
PG_TRY(); PG_TRY();
@ -2616,7 +2616,7 @@ static PyObject *
PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status) PLy_spi_execute_fetch_result(SPITupleTable *tuptable, int rows, int status)
{ {
PLyResultObject *result; PLyResultObject *result;
MemoryContext oldcontext; volatile MemoryContext oldcontext;
result = (PLyResultObject *) PLy_result_new(); result = (PLyResultObject *) PLy_result_new();
Py_DECREF(result->status); Py_DECREF(result->status);