Fix memory leaks in pg_locale_icu.c.

The backport prior to 18 requires minor modification due to code
refactoring.

Discussion: https://postgr.es/m/e2b7a0a88aaadded7e2d19f42d5ab03c9e182ad8.camel@j-davis.com
Backpatch-through: 16

diff --git a/src/backend/utils/adt/pg_locale_icu.c b/src/backend/utils/adt/pg_locale_icu.c
index 88f86ab18a3980d9e6dc4587362923d3f4709e8d..352b4c3885fb63ab24fe78f4e2bcd4785fec435d 100644 (file)
--- a/src/backend/utils/adt/pg_locale_icu.c
+++ b/src/backend/utils/adt/pg_locale_icu.c
@@ -597,6 +597,8 @@ make_icu_collator(const char *iculocstr, const char *icurules)
                                                        iculocstr, icurules, u_errorName(status))));
                }
 
+               pfree(my_rules);
+               pfree(all_rules);
                return collator_all_rules;
        }
 }
@@ -1106,6 +1108,9 @@ strnxfrm_prefix_icu(char *dest, size_t destsize,
                                (errmsg("sort key generation failed: %s",
                                                u_errorName(status))));
 
+       if (buf != sbuf)
+               pfree(buf);
+
        return result_bsize;
 }