From 50359113e9fa9c48731efa7dbd725fe11b22cab0 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 13 Dec 2022 18:01:36 +0900
Subject: [PATCH] locale-setup: clear partially loaded context on failure

---
 src/shared/locale-setup.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/shared/locale-setup.c b/src/shared/locale-setup.c
index 4b0d46995b..1b85ec4135 100644
--- a/src/shared/locale-setup.c
+++ b/src/shared/locale-setup.c
@@ -135,13 +135,10 @@ int locale_context_load(LocaleContext *c, LocaleLoadFlag flag) {
         r = locale_context_load_env(c, flag);
 
 finalize:
-        if (r < 0)
-                return r;
-
-        if (r == 0) {
-                /* Nothing loaded. */
+        if (r <= 0) {
+                /* Nothing loaded, or error. */
                 locale_context_clear(c);
-                return 0;
+                return r;
         }
 
         if (FLAGS_SET(flag, LOCALE_LOAD_SIMPLIFY))
-- 
2.25.1