TT#91151 don't segfault on empty strings to redis

Change-Id: I8a68fd61c862ce85f6a8879c7e2f85a05723a2b6
4 years ago · c6bb16612d
parent 1fd62d6857
commit c6bb16612d
1 changed files with 1 additions and 1 deletions
--- a/daemon/redis.c
+++ b/daemon/redis.c
@ -2094,7 +2094,7 @@ err:
 		json_builder_set_member_name(builder, a); \
 		json_builder_add_string_value_uri_enc(builder, d, l); \
 	} while (0)
-#define JSON_SET_SIMPLE_CSTR(a,d) JSON_SET_SIMPLE_LEN(a, strlen(d), d)
+#define JSON_SET_SIMPLE_CSTR(a,d) JSON_SET_SIMPLE_LEN(a, (d) ? strlen(d) : 0, (d) ? : "")
 #define JSON_SET_SIMPLE_STR(a,d) JSON_SET_SIMPLE_LEN(a, (d)->len, (d)->s)

 static void json_update_crypto_params(JsonBuilder *builder, const char *key, struct crypto_params *p) {