From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 14 Jun 2022 00:04:00 +0000 (+0900)
Subject: locale-util: fix memleak on failure
X-Git-Tag: v252-rc1~808^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065058e63b566e21af737150ecd12bff57b97124;p=thirdparty%2Fsystemd.git

locale-util: fix memleak on failure
---

diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c
index cb99641263b..3fce1a55f61 100644
--- a/src/basic/locale-util.c
+++ b/src/basic/locale-util.c
@@ -160,7 +160,7 @@ static int add_locales_from_archive(Set *locales) {
         return r;
 }
 
-static int add_locales_from_libdir (Set *locales) {
+static int add_locales_from_libdir(Set *locales) {
         _cleanup_closedir_ DIR *dir = NULL;
         int r;
 
@@ -187,7 +187,7 @@ static int add_locales_from_libdir (Set *locales) {
 }
 
 int get_locales(char ***ret) {
-        _cleanup_set_free_ Set *locales = NULL;
+        _cleanup_set_free_free_ Set *locales = NULL;
         _cleanup_strv_free_ char **l = NULL;
         int r;
 
@@ -207,6 +207,9 @@ int get_locales(char ***ret) {
         if (!l)
                 return -ENOMEM;
 
+        /* Now, all elements are owned by strv 'l'. Hence, do not call set_free_free(). */
+        locales = set_free(locales);
+
         r = getenv_bool("SYSTEMD_LIST_NON_UTF8_LOCALES");
         if (r == -ENXIO || r == 0) {
                 char **a, **b;