[IOT-1354] Multiple APIs crashed instead of returning OC_STACK_INVALID_PARAM while...

Change-Id: Ie04acb860f5c06d298940db9944086eb929baf05
Signed-off-by: Andrii Shtompel <a.shtompel@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12337
Reviewed-by: Kevin Kane <kkane@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>

diff --git a/resource/csdk/security/provisioning/src/cloud/aclgroup.c b/resource/csdk/security/provisioning/src/cloud/aclgroup.c
index ea38b53..fdeba13 100644 (file)
--- a/resource/csdk/security/provisioning/src/cloud/aclgroup.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclgroup.c
@@ -90,6 +90,7 @@ OCStackResult OCCloudAclCreateGroup(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupType, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s", DEFAULT_PREFIX,
@@ -120,6 +121,8 @@ OCStackResult OCCloudAclFindMyGroup(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
+
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s", DEFAULT_PREFIX,
             endPoint->addr, endPoint->port, OC_RSRVD_ACL_GROUP_URL);
 
@@ -144,6 +147,7 @@ OCStackResult OCCloudAclDeleteGroup(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s?%s=%s", DEFAULT_PREFIX,
@@ -169,6 +173,7 @@ OCStackResult OCCloudAclJoinToInvitedGroup(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s/%s", DEFAULT_PREFIX,
@@ -188,6 +193,7 @@ OCStackResult OCCloudAclObserveGroup(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s/%s", DEFAULT_PREFIX,
@@ -210,6 +216,7 @@ OCStackResult OCCloudAclShareDeviceIntoGroup(void* ctx,
     size_t dimensions[MAX_REP_ARRAY_DEPTH] = { 0 };
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(memberIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(deviceIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
@@ -248,6 +255,7 @@ OCStackResult OCCloudAclDeleteDeviceFromGroup(void* ctx,
     char uri[MAX_URI_LENGTH * 4] = { 0 };
     int max_size = sizeof(uri);
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(memberIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(deviceIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
@@ -285,6 +293,7 @@ OCStackResult OCCloudAclGroupGetInfo(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s/%s", DEFAULT_PREFIX,

diff --git a/resource/csdk/security/provisioning/src/cloud/aclid.c b/resource/csdk/security/provisioning/src/cloud/aclid.c
index 562ca0f..10bcb32 100644 (file)
--- a/resource/csdk/security/provisioning/src/cloud/aclid.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclid.c
@@ -77,6 +77,7 @@ OCStackResult OCCloudGetAclIdByDevice(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(deviceId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s?%s=%s", DEFAULT_PREFIX,
@@ -97,6 +98,7 @@ OCStackResult OCCloudAclIdCreate(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(ownerId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(deviceId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
@@ -118,6 +120,7 @@ OCStackResult OCCloudAclIdDelete(void* ctx,
 {
     char uri[MAX_URI_LENGTH]  = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(aclId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s?%s=%s", DEFAULT_PREFIX,
@@ -186,6 +189,7 @@ OCStackResult OCCloudAclIndividualGetInfo(void* ctx,
 {
     char uri[MAX_URI_LENGTH]  = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(aclId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s/%s", DEFAULT_PREFIX,
@@ -212,6 +216,7 @@ OCStackResult OCCloudAclIndividualUpdateAce(void* ctx,
     OCRepPayload **helperPayload  = NULL;
     OCRepPayload **helperPayload2 = NULL;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(aclId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(aces, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
@@ -337,6 +342,7 @@ OCStackResult OCCloudAclIndividualDelete(void* ctx,
 {
     char uri[MAX_URI_LENGTH]  = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(aclId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s/%s", DEFAULT_PREFIX,

diff --git a/resource/csdk/security/provisioning/src/cloud/aclinvite.c b/resource/csdk/security/provisioning/src/cloud/aclinvite.c
index 125a572..618734e 100644 (file)
--- a/resource/csdk/security/provisioning/src/cloud/aclinvite.c
+++ b/resource/csdk/security/provisioning/src/cloud/aclinvite.c
@@ -185,6 +185,7 @@ OCStackResult OCCloudAclInviteUser(void* ctx,
     char uri[MAX_URI_LENGTH] = { 0 };
     size_t i = 0;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(memberIds, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
@@ -245,6 +246,8 @@ OCStackResult OCCloudAclGetInvitation(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
+
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s", DEFAULT_PREFIX,
             endPoint->addr, endPoint->port, OC_RSRVD_ACL_INVITE_URL);
 
@@ -269,6 +272,7 @@ OCStackResult OCCloudAclDeleteInvitation(void* ctx,
 {
     char uri[MAX_URI_LENGTH] = { 0 };
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s", DEFAULT_PREFIX,
@@ -300,6 +304,7 @@ OCStackResult OCCloudAclCancelInvitation(void* ctx,
     char uri[MAX_URI_LENGTH] = { 0 };
     size_t len = 0 ;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(groupId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(memberId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
 
@@ -335,6 +340,7 @@ OCStackResult OCCloudAclPolicyCheck(void* ctx,
     char uri[MAX_URI_LENGTH] = { 0 };
     size_t len = 0;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(subjectId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(deviceId, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(method, TAG, "NULL input param", OC_STACK_INVALID_PARAM);

diff --git a/resource/csdk/security/provisioning/src/cloud/crl.c b/resource/csdk/security/provisioning/src/cloud/crl.c
index 088b1d5..3c444dc 100644 (file)
--- a/resource/csdk/security/provisioning/src/cloud/crl.c
+++ b/resource/csdk/security/provisioning/src/cloud/crl.c
@@ -73,6 +73,8 @@ OCStackResult OCCloudGetCRL(void* ctx,
     char uri[MAX_URI_LENGTH] = { 0 };
     char *lastUpdate = NULL;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
+
     getLastUpdateFromDB(&lastUpdate);
 
     snprintf(uri, MAX_URI_LENGTH, "%s%s:%d%s?%s=%s", DEFAULT_PREFIX,
@@ -104,6 +106,7 @@ OCStackResult OCCloudPostCRL(void* ctx,
     size_t cbor_len = 0;
     OicSecKey_t crl1;
 
+    VERIFY_NON_NULL_RET(endPoint, TAG, "NULL endpoint", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(thisUpdate, TAG, "NULL input param", OC_STACK_INVALID_PARAM);
     VERIFY_NON_NULL_RET(nextUpdate, TAG, "NULL input param", OC_STACK_INVALID_PARAM);