unaccent: Fix allocation size for target characters on initial load

michaelpq · pull[bot] · commit 4eb7571e0eff · 2024-04-09T05:02:06.000Z
This led to an overestimation of the size allocated for both the quoted and non-quoted cases, while using an inconsistent style. Thinkos in 59f47fb. Per report from Coverity, with extra input from Tom Lane.
diff --git 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);
 				}

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ initTrie(const char *filename)`
`238`	`238`	`if (trgquoted && state > 0)`
`239`	`239`	`{`
`240`	`240`	`/* Ignore first and end quotes */`
`241`		`- trgstore = palloc0(sizeof(char ) trglen - 2);`
	`241`	`+ trgstore = (char ) palloc(sizeof(char) (trglen - 2));`
`242`	`242`	`trgstorelen = 0;`
`243`	`243`	`for (int i = 1; i < trglen - 1; i++)`
`244`	`244`	`{`
`@@ -251,7 +251,7 @@ initTrie(const char *filename)`
`251`	`251`	`}`
`252`	`252`	`else`
`253`	`253`	`{`
`254`		`- trgstore = palloc0(sizeof(char ) trglen);`
	`254`	`+ trgstore = (char ) palloc(sizeof(char) trglen);`
`255`	`255`	`trgstorelen = trglen;`
`256`	`256`	`memcpy(trgstore, trg, trgstorelen);`
`257`	`257`	`}`