database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-09 02:08:45 +03:00
Code Activity

Tighten up make_libc_collator() and make_icu_collator().

Browse Source 
Ensure that error paths within these functions do not leak a collator,
and return the result rather than using an out parameter. (Error paths
in the caller may still result in a leaked collator, which will be
addressed separately.)

In make_libc_collator(), if the first newlocale() succeeds and the
second one fails, close the first locale_t object.

The function make_icu_collator() doesn't have any external callers, so
change it to be static.

Discussion: https://postgr.es/m/54d20e812bd6c3e44c10eddcd757ec494ebf1803.camel@j-davis.com
This commit is contained in:
Jeff Davis
2024-09-24 12:01:45 -07:00
parent 59f0eea7b0
commit ceeaaed87a
2 changed files with 111 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/utils/pg_locale.h
View File

@@ -104,10 +104,6 @@ struct pg_locale_struct
typedef struct pg_locale_struct *pg_locale_t;
extern void make_icu_collator(const char *iculocstr,
const char *icurules,
struct pg_locale_struct *resultp);
extern void init_database_collation(void);
extern pg_locale_t pg_newlocale_from_collation(Oid collid);