Avoid potential UCollator leak for older ICU versions.

jeff-davis · jeff-davis · commit a03b3b6b4a72 · 2023-03-24T08:48:03.000-07:00
ICU versions 53 and earlier rely on icu_set_collation_attributes() to process the attributes in the locale string. Avoid leaking the already-opened UCollator object if an error is encountered. Discussion: https://postgr.es/m/04182066-7655-344a-b8b7-040b1b2490fb%40enterprisedb.com Reviewed-by: Peter Eisentraut
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
@@ -2810,9 +2810,12 @@ icu_set_collation_attributes(UCollator *collator, const char *loc)
 			 * message across ICU versions.
 			 */
 			if (U_FAILURE(status))
+			{
+				ucol_close(collator);
 				ereport(ERROR,
 						(errmsg("could not open collator for locale \"%s\": %s",
 								loc, u_errorName(status))));
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2810,9 +2810,12 @@ icu_set_collation_attributes(UCollator collator, const char loc)`
`2810`	`2810`	`* message across ICU versions.`
`2811`	`2811`	`*/`
`2812`	`2812`	`if (U_FAILURE(status))`
	`2813`	`+ {`
	`2814`	`+ ucol_close(collator);`
`2813`	`2815`	`ereport(ERROR,`
`2814`	`2816`	`(errmsg("could not open collator for locale \"%s\": %s",`
`2815`	`2817`	`loc, u_errorName(status))));`
	`2818`	`+ }`
`2816`	`2819`	`}`
`2817`	`2820`	`}`
`2818`	`2821`