Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7b86c2a

Browse files
committed
Improve dubious memory management in pg_newlocale_from_collation().
pg_newlocale_from_collation() used malloc() and strdup() directly,which is generally not per backend coding style, and it didn't botherto check for failure results, but would just SIGSEGV instead. Also,if one of the numerous error checks in the middle of the functionfailed, the already-allocated memory would be leaked permanently.Admittedly, it's not a lot of memory, but it could build up if thisfunction were called repeatedly for a bad collation.The first two problems are easily cured by palloc'ing in TopMemoryContextinstead of calling libc directly. We can fairly easily dodge the leakageproblem for the struct pg_locale_struct by filling in a temporary variableand allocating permanent storage only once we reach the bottom of thefunction. It's harder to get rid of the potential leakage for ICU's copyof the collcollate string, but at least that's only allocated after mostof the error checks; so live with that aspect.Back-patch to v10 where this code came in, with one or another of theICU patches.
1 parent4939488 commit7b86c2a

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

‎src/backend/utils/adt/pg_locale.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,8 @@ pg_newlocale_from_collation(Oid collid)
12921292
Form_pg_collationcollform;
12931293
constchar*collcollate;
12941294
constchar*collctypepg_attribute_unused();
1295-
pg_locale_tresult;
1295+
structpg_locale_structresult;
1296+
pg_locale_tresultp;
12961297
Datumcollversion;
12971298
boolisnull;
12981299

@@ -1304,9 +1305,9 @@ pg_newlocale_from_collation(Oid collid)
13041305
collcollate=NameStr(collform->collcollate);
13051306
collctype=NameStr(collform->collctype);
13061307

1307-
result=malloc(sizeof(*result));
1308-
memset(result,0,sizeof(*result));
1309-
result->provider=collform->collprovider;
1308+
/* We'll fill in theresultstruct locally before allocating memory */
1309+
memset(&result,0,sizeof(result));
1310+
result.provider=collform->collprovider;
13101311

13111312
if (collform->collprovider==COLLPROVIDER_LIBC)
13121313
{
@@ -1353,7 +1354,7 @@ pg_newlocale_from_collation(Oid collid)
13531354
#endif
13541355
}
13551356

1356-
result->info.lt=loc;
1357+
result.info.lt=loc;
13571358
#else/* not HAVE_LOCALE_T */
13581359
/* platform that doesn't support locale_t */
13591360
ereport(ERROR,
@@ -1379,8 +1380,10 @@ pg_newlocale_from_collation(Oid collid)
13791380
(errmsg("could not open collator for locale \"%s\": %s",
13801381
collcollate,u_errorName(status))));
13811382

1382-
result->info.icu.locale=strdup(collcollate);
1383-
result->info.icu.ucol=collator;
1383+
/* We will leak this string if we get an error below :-( */
1384+
result.info.icu.locale=MemoryContextStrdup(TopMemoryContext,
1385+
collcollate);
1386+
result.info.icu.ucol=collator;
13841387
#else/* not USE_ICU */
13851388
/* could get here if a collation was created by a build with ICU */
13861389
ereport(ERROR,
@@ -1427,7 +1430,11 @@ pg_newlocale_from_collation(Oid collid)
14271430

14281431
ReleaseSysCache(tp);
14291432

1430-
cache_entry->locale=result;
1433+
/* We'll keep the pg_locale_t structures in TopMemoryContext */
1434+
resultp=MemoryContextAlloc(TopMemoryContext,sizeof(*resultp));
1435+
*resultp=result;
1436+
1437+
cache_entry->locale=resultp;
14311438
}
14321439

14331440
returncache_entry->locale;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp