More casrefully handle trucation of error message

knizhnik · kelvich · commit c3eb6bf60fdb · 2017-11-13T00:17:08.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -2710,11 +2710,12 @@ static bool MtmRunUtilityStmt(PGconn* conn, char const* sql, char **errmsg)
 	if (!ret) {
 		char *errstr = PQresultErrorMessage(result);
 		int errlen = strlen(errstr);
+		if (errlen > 9) { 
+			*errmsg = palloc0(errlen);
 
-		*errmsg = palloc0(errlen);
-
-		/* Strip "ERROR:  " from beginning and "\n" from end of error string */
-		strncpy(*errmsg, errstr + 8, errlen - 1 - 8);
+			/* Strip "ERROR:  " from beginning and "\n" from end of error string */
+			strncpy(*errmsg, errstr + 8, errlen - 1 - 8);
+		}
 	}
 
 	PQclear(result);
@@ -2781,7 +2782,7 @@ static void MtmBroadcastUtilityStmt(char const* sql, bool ignoreError)
 					do { 
 						PQfinish(conns[i]);
 					} while (--i >= 0);                             
-					elog(ERROR, "Failed to establish connection '%s' to node %d", Mtm->nodes[failedNode].con.connStr, failedNode);
+					elog(ERROR, "Failed to establish connection '%s' to node %d", Mtm->nodes[failedNode].con.connStr, failedNode+1);
 				}
 			}
 			PQsetNoticeReceiver(conns[i], MtmNoticeReceiver, &i);
