]> granicus.if.org Git - postgresql/commitdiff
Fix memory leak with lower, upper and initcap with ICU-provided collations
authorMichael Paquier <michael@paquier.xyz>
Tue, 3 Sep 2019 03:30:53 +0000 (12:30 +0900)
committerMichael Paquier <michael@paquier.xyz>
Tue, 3 Sep 2019 03:30:53 +0000 (12:30 +0900)
The leak happens in str_tolower, str_toupper and str_initcap, which are
used in several places including their equivalent SQL-level functions,
and can only be triggered when using an ICU-provided collation when
converting the input string.

b615920 fixed a similar leak.  Backpatch down 10 where ICU collations
have been introduced.

Author: Konstantin Knizhnik
Discussion: https://postgr.es/m/94c0ad0a-cbc2-e4a3-7829-2bdeaf9146db@postgrespro.ru
Backpatch-through: 10

src/backend/utils/adt/formatting.c

index b3115e4bea87459fa891d8aede50eab5b6b80a0a..755ca6e277ca70fb61804fec2576a744f7b4ab10 100644 (file)
@@ -1584,6 +1584,7 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
                                                                                &buff_conv, buff_uchar, len_uchar);
                        icu_from_uchar(&result, buff_conv, len_conv);
                        pfree(buff_uchar);
+                       pfree(buff_conv);
                }
                else
 #endif
@@ -1707,6 +1708,7 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
                                                                                &buff_conv, buff_uchar, len_uchar);
                        icu_from_uchar(&result, buff_conv, len_conv);
                        pfree(buff_uchar);
+                       pfree(buff_conv);
                }
                else
 #endif
@@ -1831,6 +1833,7 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
                                                                                &buff_conv, buff_uchar, len_uchar);
                        icu_from_uchar(&result, buff_conv, len_conv);
                        pfree(buff_uchar);
+                       pfree(buff_conv);
                }
                else
 #endif