On 2021/11/19 21:57, Bharath Rupireddy wrote:
If this is a bug, IMO the following change needs to be applied. Thought?

-------------------
                  ereport(elevel,
                                  (errcode(sqlstate),
-                                message_primary ? errmsg_internal("%s", 
message_primary) :
+                                (message_primary != NULL && message_primary[0] 
!= '\0') ?
+                                errmsg_internal("%s", message_primary) :
                                   errmsg("could not obtain message string for 
remote error"),
-------------------

I attached the patch.


What if conn->errorMessage.data is NULL and PQerrorMessage returns it?
The message_primary can still be NULL right?

Since conn->errorMessage is initialized by initPQExpBuffer(),
PQerrorMessage() seems not to return NULL. But *if* it returns NULL,
pchomp(NULL) is executed and would cause a segmentation fault.

Regards,

--
Fujii Masao
Advanced Computing Technology Center
Research and Development Headquarters
NTT DATA CORPORATION
diff --git a/contrib/postgres_fdw/connection.c 
b/contrib/postgres_fdw/connection.c
index 4aff315b7c..5c0137220a 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -824,7 +824,8 @@ pgfdw_report_error(int elevel, PGresult *res, PGconn *conn,
 
                ereport(elevel,
                                (errcode(sqlstate),
-                                message_primary ? errmsg_internal("%s", 
message_primary) :
+                                (message_primary != NULL && message_primary[0] 
!= '\0') ?
+                                errmsg_internal("%s", message_primary) :
                                 errmsg("could not obtain message string for 
remote error"),
                                 message_detail ? errdetail_internal("%s", 
message_detail) : 0,
                                 message_hint ? errhint("%s", message_hint) : 0,

Reply via email to