From: Alvaro Herrera <alvherre@alvh.no-ip.org>
Date: Mon, 8 Oct 2018 13:37:21 +0000 (-0300)
Subject: Silence compiler warning in Assert()
X-Git-Tag: REL_12_BETA1~1431
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eee01d606eb40f760799320e75d45c84022353d8;p=thirdparty%2Fpostgresql.git

Silence compiler warning in Assert()

gcc 6.3 does not whine about this mistake I made in 39808e8868c8 but
evidently lots of other compilers do, according to Michael Paquier,
Peter Eisentraut, Arthur Zakirov, Tomas Vondra.

Discussion: too many to list
---

diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 2c1dc47541c..9a702e4097e 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -1761,7 +1761,7 @@ EventTriggerCollectAlterTableSubcmd(Node *subcmd, ObjectAddress address)
 		return;
 
 	Assert(IsA(subcmd, AlterTableCmd));
-	Assert(OidIsValid(currentEventTriggerState->currentCommand));
+	Assert(currentEventTriggerState->currentCommand != NULL);
 	Assert(OidIsValid(currentEventTriggerState->currentCommand->d.alterTable.objectId));
 
 	oldcxt = MemoryContextSwitchTo(currentEventTriggerState->cxt);