mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Improve libpq's handling of OOM during error message construction.
Commitffa2e4670
changed libpq so that multiple error reports occurring during one operation (a connection attempt or query) are accumulated in conn->errorMessage, where before new ones usually replaced any prior error. At least in theory, that makes us more vulnerable to running out of memory for the errorMessage buffer. If it did happen, the user would be left with just an empty-string error report, which is pretty unhelpful. We can improve this by relying on pqexpbuffer.c's existing "broken buffer" convention to track whether we've hit OOM for the current operation's error string, and then substituting a constant "out of memory" string in the small number of places where the errorMessage is read out. While at it, apply the same method to similar OOM cases in pqInternalNotice and pqGetErrorNotice3. Back-patch to v14 whereffa2e4670
came in. In principle this could go back further; but in view of the lack of field reports, the hazard seems negligible in older branches. Discussion: https://postgr.es/m/530153.1627425648@sss.pgh.pa.us
This commit is contained in:
@ -6743,6 +6743,14 @@ PQerrorMessage(const PGconn *conn)
|
||||
if (!conn)
|
||||
return libpq_gettext("connection pointer is NULL\n");
|
||||
|
||||
/*
|
||||
* The errorMessage buffer might be marked "broken" due to having
|
||||
* previously failed to allocate enough memory for the message. In that
|
||||
* case, tell the application we ran out of memory.
|
||||
*/
|
||||
if (PQExpBufferBroken(&conn->errorMessage))
|
||||
return libpq_gettext("out of memory\n");
|
||||
|
||||
return conn->errorMessage.data;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user