From: Tim Kourt <tim.a.kourt@intel.com>
Date: Wed, 26 Aug 2015 21:07:57 +0000 (-0700)
Subject: Fix for the incorrect payload size conversion in the stack
X-Git-Tag: 1.2.0+RC1~1164
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bb3f851bcc8fa5a1b89a724a3942fa2da9049828;p=platform%2Fupstream%2Fiotivity.git

Fix for the incorrect payload size conversion in the stack

Change-Id: I928170769799b4c9ca5c466680e9103956a35a53
Signed-off-by: Tim Kourt <tim.a.kourt@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2290
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com>
---

diff --git a/resource/csdk/stack/src/ocpayloadconvert.c b/resource/csdk/stack/src/ocpayloadconvert.c
index a95c618..02a5b0f 100644
--- a/resource/csdk/stack/src/ocpayloadconvert.c
+++ b/resource/csdk/stack/src/ocpayloadconvert.c
@@ -109,6 +109,8 @@ OCStackResult OCConvertPayload(OCPayload* payload, uint8_t** outPayload, size_t*
                 OICFree(out);
                 return OC_STACK_NO_MEMORY;
             }
+
+            out = out2;
         }
 
         *size = curSize;