From c5eea02c665df1eaf0cdba88205a46734edbb7a8 Mon Sep 17 00:00:00 2001
From: Seungha Son <seungha.son@samsung.com>
Date: Thu, 11 Jan 2018 18:54:46 +0900
Subject: [PATCH] Add condition to check nullptr

Signed-off-by: Seungha Son <seungha.son@samsung.com>
Change-Id: I4557bbb36ede24d897f80f38dd488c07f4320736
---
 src/hybrid/step/pkgmgr/step_generate_xml.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hybrid/step/pkgmgr/step_generate_xml.cc b/src/hybrid/step/pkgmgr/step_generate_xml.cc
index 6e85efb..10246e9 100644
--- a/src/hybrid/step/pkgmgr/step_generate_xml.cc
+++ b/src/hybrid/step/pkgmgr/step_generate_xml.cc
@@ -111,8 +111,8 @@ void StepGenerateXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
     if (std::find(kNeedMergeNodes.begin(), kNeedMergeNodes.end(),
         reinterpret_cast<const char*>(cur->name)) != kNeedMergeNodes.end())
       continue;
-    xmlAddNextSibling(last, cur);
-    last = last->next;
+    if (xmlAddNextSibling(last, cur) != nullptr)
+      last = last->next;
   }
 }
 
-- 
2.7.4