From: Aki Tuomi <cmouse@desteem.org>
Date: Thu, 23 Jan 2014 12:58:15 +0000 (+0200)
Subject: Fixed getBeforeAndAfterNamesAbsolute NULL handling
X-Git-Tag: rec-3.6.0-rc1~228^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d90691e853713564dba68ca14e6cf59156d91589;p=pdns

Fixed getBeforeAndAfterNamesAbsolute NULL handling
---

diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc
index e3243fc97..7a63d94b6 100644
--- a/modules/remotebackend/remotebackend.cc
+++ b/modules/remotebackend/remotebackend.cc
@@ -287,9 +287,20 @@ bool RemoteBackend::getBeforeAndAfterNamesAbsolute(uint32_t id, const std::strin
    if (this->send(query) == false || this->recv(answer) == false)
      return false;
 
-   unhashed = getString(answer["result"]["unhashed"]);
-   before = getString(answer["result"]["before"]);
-   after = getString(answer["result"]["after"]);
+   if (answer["result"]["unhashed"].IsNull())
+     unhashed = "";
+    else
+     unhashed = getString(answer["result"]["unhashed"]);
+
+   if (answer["result"]["before"].IsNull())
+     before = "";
+   else 
+     before = getString(answer["result"]["before"]);
+
+   if (answer["result"]["after"].IsNull())
+     after = "";
+   else 
+     after = getString(answer["result"]["after"]);
   
    return true;
 }