Merge branch 1.3-rel (1.3.0-RC2)

Change-Id: I5177f05d782fc22507e2032b2924d7d900000003
Signed-off-by: Philippe Coval <philippe.coval@osg.samsung.com>
Origin: https://gerrit.iotivity.org/gerrit/#/c/20079/
Reviewed-on: https://gerrit.iotivity.org/gerrit/20079

resource/csdk/connectivity/test/ssladapter_test.cpp

@@ -3202,7 +3202,7 @@ TEST(TLSAdapter, Test_11)
 
     CAsetPskCredentialsCallback(GetDtlsPskCredentials);
 
-    EXPECT_NE(0, socketConnect());
+    EXPECT_NE(false, socketConnect());
     ASSERT_FALSE(socket_error) << "Client: cannot connect to server";
 
     // CAinitiateSslHandshake

resource/csdk/stack/src/ocendpoint.c

@@ -29,6 +29,9 @@
 #define VERIFY_GT_ZERO(arg) { if (arg < 1) {OIC_LOG(FATAL, TAG, #arg " < 1"); goto exit;} }
 #define VERIFY_GT(arg1, arg2) { if (arg1 <= arg2) {OIC_LOG(FATAL, TAG, #arg1 " <= " #arg2); goto exit;} }
 #define VERIFY_LT_OR_EQ(arg1, arg2) { if (arg1 > arg2) {OIC_LOG(FATAL, TAG, #arg1 " > " #arg2); goto exit;} }
+#define VERIFY_SNPRINTF_RET(arg1, arg2) \
+    { if (0 > arg1 || arg1 >= arg2) {OIC_LOG(FATAL, TAG, "Error (snprintf)"); goto exit;} } \
+
 #define TAG  "OIC_RI_ENDPOINT"
 
 OCStackResult OCGetSupportedEndpointFlags(const OCTpsSchemeFlags givenFlags, OCTpsSchemeFlags* out)
@@ -246,42 +249,47 @@ char* OCCreateEndpointString(const OCEndpointPayload* endpoint)
         if (endpoint->family & OC_IP_USE_V4)
         {
             // ipv4
-            snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s:%d", endpoint->tps,
-                     endpoint->addr, endpoint->port);
+            int snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s:%d", endpoint->tps,
+                                  endpoint->addr, endpoint->port);
+            VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
         }
         else
         {
             // ipv6
-            snprintf(buf, MAX_ADDR_STR_SIZE, "%s://[%s]:%d", endpoint->tps,
-                     endpoint->addr, endpoint->port);
+            int snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://[%s]:%d", endpoint->tps,
+                                  endpoint->addr, endpoint->port);
+            VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
         }
     }
 #ifdef EDR_ADAPTER
     else if ((strcmp(endpoint->tps, COAP_RFCOMM_STR) == 0))
     {
         // coap+rfcomm
-        snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s",
-                 endpoint->tps, endpoint->addr);
+        int snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s",
+                              endpoint->tps, endpoint->addr);
+        VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
     }
 #endif
     else
     {
         OIC_LOG_V(ERROR, TAG, "Payload has invalid TPS!!! %s", endpoint->tps);
-        return NULL;
+        goto exit;
     }
     return buf;
 
 exit:
+    OICFree(buf);
     return NULL;
 }
 
 char* OCCreateEndpointStringFromCA(const CAEndpoint_t* endpoint)
 {
-    if (!endpoint)
+    if (!endpoint || 0 == strlen(endpoint->addr))
     {
         return NULL;
     }
 
+    int snRet = -1;
     char *buf = NULL;
     OCTpsSchemeFlags tps = OC_NO_TPS;
     OCStackResult result = OCGetMatchedTpsFlags(endpoint->adapter, endpoint->flags, &tps);
@@ -302,7 +310,7 @@ char* OCCreateEndpointStringFromCA(const CAEndpoint_t* endpoint)
 #ifdef HTTP_ADAPTER
     case OC_HTTP: case OC_HTTPS:
 #endif
-        if (!endpoint->addr || !endpoint->port)
+        if (!endpoint->port)
         {
             goto exit;
         }
@@ -310,24 +318,23 @@ char* OCCreateEndpointStringFromCA(const CAEndpoint_t* endpoint)
         if (endpoint->flags & CA_IPV4)
         {
             // ipv4
-            snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s:%d", ConvertTpsToString(tps),
-                     endpoint->addr, endpoint->port);
+            snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s:%d", ConvertTpsToString(tps),
+                                  endpoint->addr, endpoint->port);
+            VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
         }
         else
         {
             // ipv6
-            snprintf(buf, MAX_ADDR_STR_SIZE, "%s://[%s]:%d", ConvertTpsToString(tps),
-                     endpoint->addr, endpoint->port);
+            snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://[%s]:%d", ConvertTpsToString(tps),
+                                  endpoint->addr, endpoint->port);
+            VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
         }
         break;
 #ifdef EDR_ADAPTER
     case OC_COAP_RFCOMM:
-        if (!endpoint->addr)
-        {
-            goto exit;
-        }
         // coap+rfcomm
-        snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s", ConvertTpsToString(tps), endpoint->addr);
+        snRet = snprintf(buf, MAX_ADDR_STR_SIZE, "%s://%s", ConvertTpsToString(tps), endpoint->addr);
+        VERIFY_SNPRINTF_RET(snRet, MAX_ADDR_STR_SIZE);
         break;
 #endif
     default:
@@ -556,4 +563,4 @@ OCTpsSchemeFlags OCGetSupportedTpsFlags()
     }
 #endif
     return ret;
-}
\ No newline at end of file
+}

resource/csdk/stack/src/ocpayloadconvert.c

@@ -165,7 +165,7 @@ static int64_t OCConvertPayloadHelper(OCPayload* payload, OCPayloadFormat format
         case PAYLOAD_TYPE_SECURITY:
             return OCConvertSecurityPayload((OCSecurityPayload*)payload, outPayload, size);
         case PAYLOAD_TYPE_INTROSPECTION:
-            return OCConvertIntrospectionPayload((OCIntrospectionPayload*)payload, 
+            return OCConvertIntrospectionPayload((OCIntrospectionPayload*)payload,
                                                  outPayload, size);
         default:
             OIC_LOG_V(INFO, TAG, "ConvertPayload default %d", payload->type);
@@ -201,7 +201,7 @@ static int64_t OCConvertSecurityPayload(OCSecurityPayload* payload, uint8_t* out
     return CborNoError;
 }
 
-static int64_t OCConvertIntrospectionPayload(OCIntrospectionPayload *payload, 
+static int64_t OCConvertIntrospectionPayload(OCIntrospectionPayload *payload,
         uint8_t *outPayload, size_t *size)
 {
     memcpy(outPayload, payload->cborPayload.bytes, payload->cborPayload.len);
@@ -262,7 +262,13 @@ static int64_t OCConvertResourcePayloadCbor(CborEncoder *linkArray, OCResourcePa
         }
         VERIFY_CBOR_SUCCESS(TAG, err, "Failed creating endpoint string");
         char uri[MAX_URI_LENGTH];
-        snprintf(uri, MAX_URI_LENGTH, "%s%s", endpointStr, resource->uri);
+        int snRet = snprintf(uri, MAX_URI_LENGTH, "%s%s", endpointStr, resource->uri);
+        if(0 > snRet || snRet >= MAX_URI_LENGTH)
+        {
+            OICFree(endpointStr);
+            VERIFY_CBOR_SUCCESS(TAG, CborErrorInternalError, "Error (snprintf)");
+        }
+
         OICFree(endpointStr);
 
         err |= AddTextStringToMap(&linkMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
@@ -273,7 +279,11 @@ static int64_t OCConvertResourcePayloadCbor(CborEncoder *linkArray, OCResourcePa
              resource->anchor)
     {
         char uri[MAX_URI_LENGTH];
-        snprintf(uri, MAX_URI_LENGTH, "%s%s", resource->anchor, resource->uri);
+        int snRet = snprintf(uri, MAX_URI_LENGTH, "%s%s", resource->anchor, resource->uri);
+        if(0 > snRet || snRet >= MAX_URI_LENGTH)
+        {
+            VERIFY_CBOR_SUCCESS(TAG, CborErrorInternalError, "Error (snprintf)");
+        }
 
         err |= AddTextStringToMap(&linkMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
                                   uri);
@@ -574,7 +584,11 @@ static int64_t OCConvertDiscoveryPayloadVndOcfCbor(OCDiscoveryPayload *payload,
                 resource->rel && !strcmp(resource->rel, "self"))
             {
                 char uri[MAX_URI_LENGTH];
-                snprintf(uri, MAX_URI_LENGTH, "ocf://%s%s", payload->sid, resource->uri);
+                int snRet = snprintf(uri, MAX_URI_LENGTH, "ocf://%s%s", payload->sid, resource->uri);
+                if(0 > snRet || snRet >= MAX_URI_LENGTH)
+                {
+                    VERIFY_CBOR_SUCCESS(TAG, CborErrorInternalError, "Error (snprintf)");
+                }
 
                 err |= AddTextStringToMap(&linkMap, OC_RSRVD_HREF, sizeof(OC_RSRVD_HREF) - 1,
                                           uri);
@@ -593,7 +607,12 @@ static int64_t OCConvertDiscoveryPayloadVndOcfCbor(OCDiscoveryPayload *payload,
 
             // Anchor
             char anchor[MAX_URI_LENGTH];
-            snprintf(anchor, MAX_URI_LENGTH, "ocf://%s", payload->sid);
+            int snRet = snprintf(anchor, MAX_URI_LENGTH, "ocf://%s", payload->sid);
+            if(0 > snRet || snRet >= MAX_URI_LENGTH)
+            {
+                VERIFY_CBOR_SUCCESS(TAG, CborErrorInternalError, "Error (snprintf)");
+            }
+
             err |= AddTextStringToMap(&linkMap, OC_RSRVD_URI, sizeof(OC_RSRVD_URI) - 1, anchor);
             VERIFY_CBOR_SUCCESS(TAG, err, "Failed adding anchor to links map");
 

resource/csdk/stack/src/ocstack.c

@@ -1599,7 +1599,7 @@ void OCHandleResponse(const CAEndpoint_t* endPoint, const CAResponseInfo_t* resp
                     if (!requestData.options)
                     {
                         OIC_LOG(ERROR, TAG, "Out of memory");
-                        OICFree(&requestData.token);
+                        OICFree(requestData.token);
                         goto proceed;
                     }
                     memcpy(requestData.options, cbNode->options,

service/easy-setup/mediator/richsdk/src/EnrolleeSecurity.cpp

@@ -619,7 +619,7 @@ namespace OIC
                 result = OCSecure::discoverSingleDevice(ES_SEC_DISCOVERY_TIMEOUT,
                                                         &uuid,
                                                         m_securedResource);
-                if(result != OC_STACK_OK)
+                if(result != OC_STACK_OK || !m_securedResource)
                 {
                     return ES_SECURE_RESOURCE_DISCOVERY_FAILURE;
                 }