From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 24 Apr 2025 05:52:08 +0000 (+0900)
Subject: sd-json: fix conditions
X-Git-Tag: v258-rc1~746
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e799de1f0618e7c46d76acb07e4461cf76c877;p=thirdparty%2Fsystemd.git

sd-json: fix conditions

Fixes a bug in 6647bbeab13fb115ecd0b389963001e978da1fce (v257).

Fixes CID#1609496.
---

diff --git a/src/libsystemd/sd-json/sd-json.c b/src/libsystemd/sd-json/sd-json.c
index 494f3379f76..fa8c25da8a1 100644
--- a/src/libsystemd/sd-json/sd-json.c
+++ b/src/libsystemd/sd-json/sd-json.c
@@ -4911,10 +4911,10 @@ _public_ int sd_json_buildv(sd_json_variant **ret, va_list ap) {
                                 if (r < 0)
                                         goto finish;
 
-                                r = command == _SD_JSON_BUILD_BASE64    ? sd_json_variant_new_base64(&add_more, p, sz) :
-                                    command == _SD_JSON_BUILD_BASE32HEX ? sd_json_variant_new_base32hex(&add_more, p, sz) :
-                                    command == _SD_JSON_BUILD_HEX       ? sd_json_variant_new_hex(&add_more, p, sz) :
-                                                                          sd_json_variant_new_octescape(&add_more, p, sz);
+                                r = command == _JSON_BUILD_PAIR_BASE64_NON_EMPTY    ? sd_json_variant_new_base64(&add_more, p, sz) :
+                                    command == _JSON_BUILD_PAIR_BASE32HEX_NON_EMPTY ? sd_json_variant_new_base32hex(&add_more, p, sz) :
+                                    command == _JSON_BUILD_PAIR_HEX_NON_EMPTY       ? sd_json_variant_new_hex(&add_more, p, sz) :
+                                                                                      sd_json_variant_new_octescape(&add_more, p, sz);
                                 if (r < 0)
                                         goto finish;
                         }