From: Joseph Morrow <joseph.l.morrow@intel.com>
Date: Thu, 30 Jul 2015 18:57:01 +0000 (-0700)
Subject: Added null checks post cbor processing.
X-Git-Tag: 1.2.0+RC1~1313
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c2f64801a72a114dab5e53b1e2a823a59b19cfa;p=platform%2Fupstream%2Fiotivity.git

Added null checks post cbor processing.

This allows requests with null parameters to still operate.

This fixes IOT-632.

Change-Id: I6b7b1a48e1d50d34268e1f0fface38b5fd59cb02
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1993
Reviewed-by: Tim Kourt <tim.a.kourt@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
---

diff --git a/resource/include/OCRepresentation.h b/resource/include/OCRepresentation.h
index 7856613..b89b9fb 100644
--- a/resource/include/OCRepresentation.h
+++ b/resource/include/OCRepresentation.h
@@ -118,6 +118,8 @@ namespace OC
 
             void setChildren(const std::vector<OCRepresentation>& children);
 
+            void setUri(const char* uri);
+
             void setUri(const std::string& uri);
 
             std::string getUri() const;
diff --git a/resource/src/OCRepresentation.cpp b/resource/src/OCRepresentation.cpp
index d439bbe..998bdbe 100644
--- a/resource/src/OCRepresentation.cpp
+++ b/resource/src/OCRepresentation.cpp
@@ -619,6 +619,10 @@ namespace OC
     {
         m_children = children;
     }
+    void OCRepresentation::setUri(const char* uri)
+    {
+        m_uri = uri ? uri : "";
+    }
 
     void OCRepresentation::setUri(const std::string& uri)
     {
diff --git a/resource/src/OCResourceRequest.cpp b/resource/src/OCResourceRequest.cpp
index e5850fb..d600017 100644
--- a/resource/src/OCResourceRequest.cpp
+++ b/resource/src/OCResourceRequest.cpp
@@ -30,7 +30,11 @@ void OCResourceRequest::setPayload(OCPayload* payload)
 {
     MessageContainer info;
 
-    if(payload == nullptr || payload->type != PAYLOAD_TYPE_REPRESENTATION)
+    if(payload == nullptr)
+    {
+        return;
+    }
+    if(payload->type != PAYLOAD_TYPE_REPRESENTATION)
     {
         throw std::logic_error("Wrong payload type");
         return;