From 338f5c0be84f60228e77a0e988ead3edf409140d Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Mon, 5 Dec 2016 16:37:31 +0100 Subject: [PATCH] Fix crash in CreateObjectHandler::HandleRequest() fixes #13409 refs #11684 --- lib/remote/createobjecthandler.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/remote/createobjecthandler.cpp b/lib/remote/createobjecthandler.cpp index 97f993bbc..b4cbbd924 100644 --- a/lib/remote/createobjecthandler.cpp +++ b/lib/remote/createobjecthandler.cpp @@ -52,16 +52,22 @@ bool CreateObjectHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& r Array::Ptr templates = params->Get("templates"); Dictionary::Ptr attrs = params->Get("attrs"); - /* Put created objects into the local zone if not explicitely defined. + /* Put created objects into the local zone if not explicitly defined. * This allows additional zone members to sync the * configuration at some later point. */ Zone::Ptr localZone = Zone::GetLocalZone(); String localZoneName; - if (localZone && !attrs->Contains("zone")) { + if (localZone) { localZoneName = localZone->GetName(); - attrs->Set("zone", localZoneName); + + if (!attrs) { + attrs = new Dictionary(); + attrs->Set("zone", localZoneName); + } else if (attrs && !attrs->Contains("zone")) { + attrs->Set("zone", localZoneName); + } } Dictionary::Ptr result1 = new Dictionary();