From 88f64d22db7a0afd31c9670bda3944281e49916c Mon Sep 17 00:00:00 2001 From: Marco Slot Date: Sun, 22 Apr 2018 11:12:51 +0200 Subject: [PATCH] Prevent connection pointer is NULL details --- src/backend/distributed/connection/remote_commands.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/distributed/connection/remote_commands.c b/src/backend/distributed/connection/remote_commands.c index dc09bd8b6..aefecc5f2 100644 --- a/src/backend/distributed/connection/remote_commands.c +++ b/src/backend/distributed/connection/remote_commands.c @@ -243,10 +243,17 @@ ReportConnectionError(MultiConnection *connection, int elevel) { char *nodeName = connection->hostname; int nodePort = connection->port; + PGconn *pgConn = connection->pgConn; + char *messageDetail = NULL; + + if (pgConn != NULL) + { + messageDetail = pchomp(PQerrorMessage(pgConn)); + } ereport(elevel, (errcode(ERRCODE_CONNECTION_FAILURE), errmsg("connection error: %s:%d", nodeName, nodePort), - errdetail("%s", pchomp(PQerrorMessage(connection->pgConn))))); + messageDetail != NULL ? errdetail("%s", messageDetail) : 0)); }