rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

... and the very same bug in publicationListToArray(). 

Sigh.
This commit is contained in:
Tom Lane 2017-09-23 15:16:48 -04:00
parent 737639017c
commit 24541ffd78
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/commands/subscriptioncmds.c
View File

@ -244,7 +244,7 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
} }
/* /*
* Auxiliary function to return a text array out of a list of String nodes. * Auxiliary function to build a text array out of a list of String nodes.
*/ */
static Datum static Datum
publicationListToArray(List *publist) publicationListToArray(List *publist)
@ -264,7 +264,8 @@ publicationListToArray(List *publist)
ALLOCSET_DEFAULT_MAXSIZE); ALLOCSET_DEFAULT_MAXSIZE);
oldcxt = MemoryContextSwitchTo(memcxt); oldcxt = MemoryContextSwitchTo(memcxt);
datums = palloc(sizeof(text *) * list_length(publist)); datums = (Datum *) palloc(sizeof(Datum) * list_length(publist));
foreach(cell, publist) foreach(cell, publist)
{ {
char *name = strVal(lfirst(cell)); char *name = strVal(lfirst(cell));
@ -275,7 +276,7 @@ publicationListToArray(List *publist)
{ {
char *pname = strVal(lfirst(pcell)); char *pname = strVal(lfirst(pcell));
if (name == pname) if (pcell == cell)
break; break;
if (strcmp(name, pname) == 0) if (strcmp(name, pname) == 0)
@ -292,6 +293,7 @@ publicationListToArray(List *publist)
arr = construct_array(datums, list_length(publist), arr = construct_array(datums, list_length(publist),
TEXTOID, -1, false, 'i'); TEXTOID, -1, false, 'i');
MemoryContextDelete(memcxt); MemoryContextDelete(memcxt);
return PointerGetDatum(arr); return PointerGetDatum(arr);