Fix volatile-safety issue in dblink's materializeQueryResult().

Some fields of the sinfo struct are modified within PG_TRY and then
referenced within PG_CATCH, so as with recent patch to async.c, "volatile"
is necessary for strict POSIX compliance; and that propagates to a couple
of subroutines as well as materializeQueryResult() itself.  I think the
risk of actual issues here is probably higher than in async.c, because
storeQueryResult() is likely to get inlined into materializeQueryResult(),
leaving the compiler free to conclude that its stores into sinfo fields are
dead code.

diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 6880eb9cac3e5975eb2ed021c5d1382e96054190..6f972be0d7f22cec463b12050510c4918dc3f5ff 100644 (file)
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -88,8 +88,8 @@ static void materializeQueryResult(FunctionCallInfo fcinfo,
                                           const char *conname,
                                           const char *sql,
                                           bool fail);
-static PGresult *storeQueryResult(storeInfo *sinfo, PGconn *conn, const char *sql);
-static void storeRow(storeInfo *sinfo, PGresult *res, bool first);
+static PGresult *storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql);
+static void storeRow(volatile storeInfo *sinfo, PGresult *res, bool first);
 static remoteConn *getConnectionByName(const char *name);
 static HTAB *createConnHash(void);
 static void createNewConnection(const char *name, remoteConn *rconn);
@@ -958,13 +958,13 @@ materializeQueryResult(FunctionCallInfo fcinfo,
 {
        ReturnSetInfo *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
        PGresult   *volatile res = NULL;
-       storeInfo       sinfo;
+       volatile storeInfo sinfo;
 
        /* prepTuplestoreResult must have been called previously */
        Assert(rsinfo->returnMode == SFRM_Materialize);
 
        /* initialize storeInfo to empty */
-       memset(&sinfo, 0, sizeof(sinfo));
+       memset((void *) &sinfo, 0, sizeof(sinfo));
        sinfo.fcinfo = fcinfo;
 
        PG_TRY();
@@ -1069,7 +1069,7 @@ materializeQueryResult(FunctionCallInfo fcinfo,
  * Execute query, and send any result rows to sinfo->tuplestore.
  */
 static PGresult *
-storeQueryResult(storeInfo *sinfo, PGconn *conn, const char *sql)
+storeQueryResult(volatile storeInfo *sinfo, PGconn *conn, const char *sql)
 {
        bool            first = true;
        int                     nestlevel = -1;
@@ -1137,7 +1137,7 @@ storeQueryResult(storeInfo *sinfo, PGconn *conn, const char *sql)
  * (in this case the PGresult might contain either zero or one row).
  */
 static void
-storeRow(storeInfo *sinfo, PGresult *res, bool first)
+storeRow(volatile storeInfo *sinfo, PGresult *res, bool first)
 {
        int                     nfields = PQnfields(res);
        HeapTuple       tuple;