Use palloc_array() in a few more places to avoid overflow

hlinnaka · anju15bharti · commit 6152635c49c4 · 2026-05-13T10:14:57.000Z
These could overflow on 32-bit systems. Backpatch-through: 14 Security: CVE-2026-6473 (cherry picked from commit 3fbec9e504b1b4dca0a30d4081e1eaa687510fc5)
diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
@@ -121,7 +121,7 @@ plperl_to_hstore(PG_FUNCTION_ARGS)
 
 	pcount = hv_iterinit(hv);
 
-	pairs = palloc(pcount * sizeof(Pairs));
+	pairs = palloc_array(Pairs, pcount);
 
 	i = 0;
 	while ((he = hv_iternext(hv)))
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
@@ -150,7 +150,7 @@ plpython_to_hstore(PG_FUNCTION_ARGS)
 		Py_ssize_t	i;
 		Pairs	   *pairs;
 
-		pairs = palloc(pcount * sizeof(*pairs));
+		pairs = palloc_array(Pairs, pcount);
 
 		for (i = 0; i < pcount; i++)
 		{

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ plpython_to_hstore(PG_FUNCTION_ARGS)`
`150`	`150`	`Py_ssize_t i;`
`151`	`151`	`Pairs *pairs;`
`152`	`152`
`153`		`- pairs = palloc(pcount * sizeof(*pairs));`
	`153`	`+ pairs = palloc_array(Pairs, pcount);`
`154`	`154`
`155`	`155`	`for (i = 0; i < pcount; i++)`
`156`	`156`	`{`