mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid double-free in vacuumlo error path.

Browse Source 
The code would do "PQclear(res)" twice if lo_unlink failed, evidently
due to careless thinking about how far out a "break" would break.
Remove the extra PQclear and adjust the loop logic so that we'll fall
out of both levels of loop after an error, as was clearly the intent.

Spotted by Coverity.  I have no idea why it took this long to notice,
since the bug has been there since commit 67ccbb080.  Accordingly,
back-patch to all supported branches.
This commit is contained in:
Tom Lane 2019-03-24 15:13:21 -04:00
parent 89f39736f4
commit b7ffa0ee8d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/vacuumlo/vacuumlo.c
View File

@ -316,7 +316,7 @@ vacuumlo(const char *database, const struct _param *param)
deleted = 0; deleted = 0;
while (1) do
{ {
res = PQexec(conn, buf); res = PQexec(conn, buf);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
@ -354,8 +354,7 @@ vacuumlo(const char *database, const struct _param *param)
if (PQtransactionStatus(conn) == PQTRANS_INERROR) if (PQtransactionStatus(conn) == PQTRANS_INERROR)
{ {
success = false; success = false;
PQclear(res); break; /* out of inner for-loop */
break;
} }
} }
else else
@ -393,7 +392,7 @@ vacuumlo(const char *database, const struct _param *param)
} }
PQclear(res); PQclear(res);
} } while (success);
/* /*
* That's all folks! * That's all folks!