json: handle NULL explicitly in json_variant_has_type()
authorLennart Poettering <lennart@poettering.net>
Fri, 4 Jan 2019 12:24:18 +0000 (13:24 +0100)
committerMartin Pitt <mpitt@debian.org>
Mon, 18 Feb 2019 13:54:04 +0000 (13:54 +0000)
(cherry picked from commit f8c186c9ece5c1c0b89abf52f058efb0ed37e0cb)
(cherry picked from commit 388e534d24cac041bd00b48f27a84d6b31089c67)

Gbp-Pq: Name json-handle-NULL-explicitly-in-json_variant_has_type.patch

src/shared/json.c

index 59c4617592caa1834ddb5e949f8a0a16c87de84e..c9ee74c2d317a80172d3c79fb192f556318a196a 100644 (file)
@@ -979,6 +979,8 @@ bool json_variant_has_type(JsonVariant *v, JsonVariantType type) {
         JsonVariantType rt;
 
         v = json_variant_dereference(v);
+        if (!v)
+                return false;
 
         rt = json_variant_type(v);
         if (rt == type)