From: Michael Paquier <michael@paquier.xyz>
Date: Mon, 25 Sep 2023 00:31:48 +0000 (+0900)
Subject: unaccent: Fix allocation size for target characters on initial load
X-Git-Tag: REL_17_BETA1~1841
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f19669fed3efe872425c80d4b1f45bf59267b7ea;p=thirdparty%2Fpostgresql.git

unaccent: Fix allocation size for target characters on initial load

This led to an overestimation of the size allocated for both the quoted
and non-quoted cases, while using an inconsistent style.  Thinkos in
59f47fb98dab.

Per report from Coverity, with extra input from Tom Lane.
---

diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
index 5635f042145..544246e37f1 100644
--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@@ -238,7 +238,7 @@ initTrie(const char *filename)
 				if (trgquoted && state > 0)
 				{
 					/* Ignore first and end quotes */
-					trgstore = palloc0(sizeof(char *) * trglen - 2);
+					trgstore = (char *) palloc(sizeof(char) * (trglen - 2));
 					trgstorelen = 0;
 					for (int i = 1; i < trglen - 1; i++)
 					{
@@ -251,7 +251,7 @@ initTrie(const char *filename)
 				}
 				else
 				{
-					trgstore = palloc0(sizeof(char *) * trglen);
+					trgstore = (char *) palloc(sizeof(char) * trglen);
 					trgstorelen = trglen;
 					memcpy(trgstore, trg, trgstorelen);
 				}