From a7a252dc16ff5fc1b75fa044bb90600a487a12ce Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 20 Apr 2026 09:35:33 +0200 Subject: [PATCH] sd-json: make sure SD_JSON_BUILD_STRING_UNDERSCORIFY() can deal with NULL strings SD_JSON_BUILD_STRING() and everything else can deal with it, make sure SD_JSON_BUILD_STRING_UNDERSCORIFY() can too. (cherry picked from commit a77a95665fba06861125a4a62ffed8ccd75f37f2) (cherry picked from commit 29f4fba3c63341fcbfaa5152580e592c09470f47) (cherry picked from commit a09efa6cf52109d941be9efa4eac40fd73b17931) --- src/libsystemd/sd-json/sd-json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-json/sd-json.c b/src/libsystemd/sd-json/sd-json.c index 780e7ba2aa7..098c41da329 100644 --- a/src/libsystemd/sd-json/sd-json.c +++ b/src/libsystemd/sd-json/sd-json.c @@ -3532,7 +3532,7 @@ _public_ int sd_json_buildv(sd_json_variant **ret, va_list ap) { if (current->n_suppress == 0) { _cleanup_free_ char *c = NULL; - if (command == _JSON_BUILD_STRING_UNDERSCORIFY) { + if (command == _JSON_BUILD_STRING_UNDERSCORIFY && p) { c = strreplace(p, "-", "_"); if (!c) { r = -ENOMEM;