From: Tom Gundersen <teg@jklm.no>
Date: Mon, 25 May 2015 20:47:42 +0000 (+0200)
Subject: import: dkr - avoid NULL-pointer dereference
X-Git-Tag: v221~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37591152d261ba980b8992de37ee940c9e5c5da0;p=thirdparty%2Fsystemd.git

import: dkr - avoid NULL-pointer dereference

A malformed manifest could in principle cause a NULL pointer dereference of. Check
for this and fail early.

Fixes CID 1299642.
---

diff --git a/src/import/pull-dkr.c b/src/import/pull-dkr.c
index 40aca786a54..d7476dc3402 100644
--- a/src/import/pull-dkr.c
+++ b/src/import/pull-dkr.c
@@ -864,7 +864,7 @@ static void dkr_pull_job_on_finished_v2(PullJob *j) {
                 }
 
                 e = json_variant_value(doc, "fsLayers");
-                if (!e || e->type != JSON_VARIANT_ARRAY) {
+                if (!e || e->type != JSON_VARIANT_ARRAY || e->size == 0) {
                         r = -EBADMSG;
                         goto finish;
                 }