Fix 'uninitialized variable' warning and potentially wrong code.

Report and original patch by Götz Lange and André Malo.

diff --git a/sql/pgq/triggers/sqltriga.c b/sql/pgq/triggers/sqltriga.c
index bc359fff02f27c619ac4986c303f61bf3ac4b6f7..6dbb1cd160424ec3177dc1a82020cb2702391edf 100644 (file)
--- a/sql/pgq/triggers/sqltriga.c
+++ b/sql/pgq/triggers/sqltriga.c
@@ -49,6 +49,8 @@ pgq_sqltriga(PG_FUNCTION_ARGS)
        if (!CALLED_AS_TRIGGER(fcinfo))
                elog(ERROR, "pgq.logutriga not called as trigger");
 
+       tg = (TriggerData *) (fcinfo->context);
+
        if (pgq_is_logging_disabled())
                goto skip_it;
 
@@ -58,7 +60,6 @@ pgq_sqltriga(PG_FUNCTION_ARGS)
        if (SPI_connect() < 0)
                elog(ERROR, "logtriga: SPI_connect() failed");
 
-       tg = (TriggerData *) (fcinfo->context);
        pgq_prepare_event(&ev, tg, true);
 
        appendStringInfoChar(ev.ev_type, ev.op_type);