Commit7376390

committed

Fix bogus size calculation in strlist_to_textarray().

It's making an array of Datum, not an array of text *. The mistakeis harmless since those are currently the same size, but it's stillwrong.

1 parent335f3d0 commit7376390Copy full SHA for 7376390

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5051,7 +5051,7 @@ getRelationIdentity(StringInfo buffer, Oid relid, List **object)`
`5051`	`5051`	`}`
`5052`	`5052`
`5053`	`5053`	`/*`
`5054`		`- * Auxiliary function toreturn a TEXT array out of a list of C-strings.`
	`5054`	`+ * Auxiliary function tobuild a TEXT array out of a list of C-strings.`
`5055`	`5055`	`*/`
`5056`	`5056`	`ArrayType*`
`5057`	`5057`	`strlist_to_textarray(List*list)`
`@@ -5063,12 +5063,14 @@ strlist_to_textarray(List *list)`
`5063`	`5063`	`MemoryContextmemcxt;`
`5064`	`5064`	`MemoryContextoldcxt;`
`5065`	`5065`
	`5066`	`+/* Work in a temp context; easier than individually pfree'ing the Datums */`
`5066`	`5067`	`memcxt=AllocSetContextCreate(CurrentMemoryContext,`
`5067`	`5068`	`"strlist to array",`
`5068`	`5069`	`ALLOCSET_DEFAULT_SIZES);`
`5069`	`5070`	`oldcxt=MemoryContextSwitchTo(memcxt);`
`5070`	`5071`
`5071`		`-datums=palloc(sizeof(text)list_length(list));`
	`5072`	`+datums= (Datum)palloc(sizeof(Datum)list_length(list));`
	`5073`	`+`
`5072`	`5074`	`foreach(cell,list)`
`5073`	`5075`	`{`
`5074`	`5076`	`char*name=lfirst(cell);`
`@@ -5080,6 +5082,7 @@ strlist_to_textarray(List *list)`
`5080`	`5082`
`5081`	`5083`	`arr=construct_array(datums,list_length(list),`
`5082`	`5084`	`TEXTOID,-1, false,'i');`
	`5085`	`+`
`5083`	`5086`	`MemoryContextDelete(memcxt);`
`5084`	`5087`
`5085`	`5088`	`returnarr;`

Comments

(0)