From 7c0ef5dccb93891b43187a7cfc97ba33eedbb5b5 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 11 Nov 2016 10:48:37 +0100 Subject: [PATCH] builder-source: Check for type == NULL before dereferencing --- builder/builder-source.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/builder-source.c b/builder/builder-source.c index 44bee53c..508873b8 100644 --- a/builder/builder-source.c +++ b/builder/builder-source.c @@ -209,7 +209,9 @@ builder_source_from_json (JsonNode *node) type = json_object_get_string_member (object, "type"); - if (strcmp (type, "archive") == 0) + if (type == NULL) + g_warning ("Missing source type"); + else if (strcmp (type, "archive") == 0) return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_ARCHIVE, node); if (strcmp (type, "file") == 0) return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_FILE, node); @@ -223,8 +225,6 @@ builder_source_from_json (JsonNode *node) return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_GIT, node); if (strcmp (type, "bzr") == 0) return (BuilderSource *) json_gobject_deserialize (BUILDER_TYPE_SOURCE_BZR, node); - else if (type == NULL) - g_warning ("Missing source type"); else g_warning ("Unknown source type %s", type);