diff options
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index c16a7bd9f22..f83af03d0a7 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -3277,10 +3277,15 @@ keep_going: /* We will come back to here until there is conn->inStart = conn->inCursor; /* - * The postmaster typically won't end its message with a - * newline, so add one to conform to libpq conventions. + * Before 7.2, the postmaster didn't always end its + * messages with a newline, so add one if needed to + * conform to libpq conventions. */ - appendPQExpBufferChar(&conn->errorMessage, '\n'); + if (conn->errorMessage.len == 0 || + conn->errorMessage.data[conn->errorMessage.len - 1] != '\n') + { + appendPQExpBufferChar(&conn->errorMessage, '\n'); + } goto error_return; } |