Commit8f68671

committed

[PGPRO-3725] zero out garbage in append_rel_array if we allocate it.

Since 1d9056f563f3 (who uses AppendRelInfo* existence as a mark this rel ischild) in 11.7 this led to (known) random segfaults.

1 parentfa068e7 commit8f68671Copy full SHA for 8f68671

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -498,9 +498,13 @@ pathman_rel_pathlist_hook(PlannerInfo *root,`
`498`	`498`	`irange_lensizeof(RangeTblEntry));`
`499`	`499`
`500`	`500`	`#ifPG_VERSION_NUM >=110000`
`501`		`-/* Make sure append_rel_array is wide enough */`
	`501`	`+/*`
	`502`	`+ * Make sure append_rel_array is wide enough; if it hasn't been`
	`503`	`+ * allocated previously, care to zero out [0; current_len) part.`
	`504`	`+ */`
`502`	`505`	`if (root->append_rel_array==NULL)`
`503`		`-root->append_rel_array= (AppendRelInfo**)palloc0(0);`
	`506`	`+root->append_rel_array= (AppendRelInfo**)`
	`507`	`+palloc0(current_lensizeof(AppendRelInfo));`
`504`	`508`	`root->append_rel_array= (AppendRelInfo**)`
`505`	`509`	`repalloc(root->append_rel_array,`
`506`	`510`	`new_lensizeof(AppendRelInfo));`

Comments

(0)