database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix memory leaks in libpqwalreceiver

Browse Source 
The results of the libpq functions PQescapeIdentifier() and
PQescapeLiteral() must be freed explicitly.  Also handle errors in these
functions better.
This commit is contained in:
Peter Eisentraut
2017-01-23 11:06:30 -05:00
parent 7e26e02eec
commit 16a61884b5
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
View File

@@ -304,17 +304,30 @@ libpqrcv_startstreaming(WalReceiverConn *conn,
{ {
char *pubnames_str; char *pubnames_str;
List *pubnames; List *pubnames;
char *pubnames_literal;
appendStringInfoString(&cmd, " ("); appendStringInfoString(&cmd, " (");
appendStringInfo(&cmd, "proto_version '%u'", appendStringInfo(&cmd, "proto_version '%u'",
options->proto.logical.proto_version); options->proto.logical.proto_version);
pubnames = options->proto.logical.publication_names; pubnames = options->proto.logical.publication_names;
pubnames_str = stringlist_to_identifierstr(conn->streamConn, pubnames); pubnames_str = stringlist_to_identifierstr(conn->streamConn, pubnames);
appendStringInfo(&cmd, ", publication_names %s", if (!pubnames_str)
PQescapeLiteral(conn->streamConn, pubnames_str, ereport(ERROR,
strlen(pubnames_str))); (errmsg("could not start WAL streaming: %s",
appendStringInfoChar(&cmd, ')'); PQerrorMessage(conn->streamConn))));
pubnames_literal = PQescapeLiteral(conn->streamConn, pubnames_str,
strlen(pubnames_str));
if (!pubnames_literal)
ereport(ERROR,
(errmsg("could not start WAL streaming: %s",
PQerrorMessage(conn->streamConn))));
appendStringInfo(&cmd, ", publication_names %s", pubnames_literal);
PQfreemem(pubnames_literal);
pfree(pubnames_str); pfree(pubnames_str);
appendStringInfoChar(&cmd, ')');
} }
else else
appendStringInfo(&cmd, " TIMELINE %u", appendStringInfo(&cmd, " TIMELINE %u",
@@ -736,14 +749,21 @@ stringlist_to_identifierstr(PGconn *conn, List *strings)
foreach (lc, strings) foreach (lc, strings)
{ {
char *val = strVal(lfirst(lc)); char *val = strVal(lfirst(lc));
char *val_escaped;
if (first) if (first)
first = false; first = false;
else else
appendStringInfoChar(&res, ','); appendStringInfoChar(&res, ',');
appendStringInfoString(&res, val_escaped = PQescapeIdentifier(conn, val, strlen(val));
PQescapeIdentifier(conn, val, strlen(val))); if (!val_escaped)
{
free(res.data);
return NULL;
}
appendStringInfoString(&res, val_escaped);
PQfreemem(val_escaped);
} }
return res.data; return res.data;