SVACE issue fix

Change-Id: Ie38b89e8eca7acebd6bd84cc59af5362e87b7934
Signed-off-by: Manasij Sur Roy <manasij.r@samsung.com>

diff --git a/common/uafv1tlvutil/src/AttBasicFullTlvEncoder.cpp b/common/uafv1tlvutil/src/AttBasicFullTlvEncoder.cpp
index b93cc5e..233d16b 100644 (file)
--- a/common/uafv1tlvutil/src/AttBasicFullTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/AttBasicFullTlvEncoder.cpp
@@ -63,7 +63,11 @@ AttBasicFullTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_ATTESTATION_BASIC_FULL, NULL);
+       if (root->tag != TAG_ATTESTATION_BASIC_FULL) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        int endIter = rawIter + root->len;

diff --git a/common/uafv1tlvutil/src/AttBasicSurrTlvEncoder.cpp b/common/uafv1tlvutil/src/AttBasicSurrTlvEncoder.cpp
index 540223c..7b37eaf 100644 (file)
--- a/common/uafv1tlvutil/src/AttBasicSurrTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/AttBasicSurrTlvEncoder.cpp
@@ -60,7 +60,11 @@ AttBasicSurrTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_ATTESTATION_BASIC_SURROGATE, NULL);
+       if (root->tag != TAG_ATTESTATION_BASIC_SURROGATE) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        int endIter = rawIter + root->len;

diff --git a/common/uafv1tlvutil/src/DeRegReqTlvEncoder.cpp b/common/uafv1tlvutil/src/DeRegReqTlvEncoder.cpp
index 830f1d4..d4ff376 100644 (file)
--- a/common/uafv1tlvutil/src/DeRegReqTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/DeRegReqTlvEncoder.cpp
@@ -75,7 +75,11 @@ DeRegReqTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_UAFV1_DEREGISTER_CMD, NULL);
+       if (root->tag != TAG_UAFV1_DEREGISTER_CMD) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        int endIter = rawIter + root->len;

diff --git a/common/uafv1tlvutil/src/DeRegRespTlvEncoder.cpp b/common/uafv1tlvutil/src/DeRegRespTlvEncoder.cpp
index 1302893..e6a8ac5 100644 (file)
--- a/common/uafv1tlvutil/src/DeRegRespTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/DeRegRespTlvEncoder.cpp
@@ -59,7 +59,11 @@ DeRegRespTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_UAFV1_DEREGISTER_CMD_RESPONSE, NULL);
+       if (root->tag != TAG_UAFV1_DEREGISTER_CMD_RESPONSE) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        DeregResp *getDeRegRespInfo = ALLOC(DeregResp);
 

diff --git a/common/uafv1tlvutil/src/GetInfoRespTlvEncoder.cpp b/common/uafv1tlvutil/src/GetInfoRespTlvEncoder.cpp
index 7485cd6..132a586 100644 (file)
--- a/common/uafv1tlvutil/src/GetInfoRespTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/GetInfoRespTlvEncoder.cpp
@@ -459,6 +459,9 @@ AuthInfoTlvEncoder::decode(const unsigned char *rawData)
                if (rawIter >= end_iter)
                        break;
 
+               SAFE_DELETE(child->val);
+               SAFE_DELETE(child);
+
                child = tlv_decode(rawData + rawIter);
        }
 
@@ -637,8 +640,8 @@ GetInfoRespTlvEncoder::decode(const unsigned char *rawData)
        int end_iter = rawIter + root->len;
        _INFO("GetInfoRespTlvEncoder TOTAL LEN = [%d] bytes", end_iter);
 
-       RET_IF_FAIL(root->tag == TAG_UAFV1_GETINFO_CMD_RESPONSE, NULL);
        if (root->tag != TAG_UAFV1_GETINFO_CMD_RESPONSE) {
+               SAFE_DELETE(root->val);
                SAFE_DELETE(root);
                return NULL;
        }

diff --git a/common/uafv1tlvutil/src/RegAuthAssertionTlvEncoder.cpp b/common/uafv1tlvutil/src/RegAuthAssertionTlvEncoder.cpp
index a848d6d..49e1aa8 100644 (file)
--- a/common/uafv1tlvutil/src/RegAuthAssertionTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/RegAuthAssertionTlvEncoder.cpp
@@ -52,6 +52,7 @@ RegAuthAssertionTlvEncoder::encode(const void *authData)
                regAssertionKrdBuff->data = getRegAssertionKrdTlv->val;
                tlv_builder_add_buffer(builder, TAG_UAFV1_KRD, regAssertionKrdBuff);
                SAFE_DELETE(regAssertionKrdBuff);
+               SAFE_DELETE(getRegAssertionKrdTlv);
        }
 
        if(getRegAssertion->attFull != NULL) {
@@ -68,6 +69,7 @@ RegAuthAssertionTlvEncoder::encode(const void *authData)
                tlv_builder_add_buffer(builder, TAG_ATTESTATION_BASIC_FULL, attBasicFullBuff);
                SAFE_DELETE(attBasicFullBuff);
                SAFE_DELETE(getAttBasicFullBuffInfo);
+               SAFE_DELETE(getAttBasicFullInfoTlv);
        }
        else if(getRegAssertion->attSur != NULL) {
 
@@ -83,6 +85,7 @@ RegAuthAssertionTlvEncoder::encode(const void *authData)
                tlv_builder_add_buffer(builder, TAG_ATTESTATION_BASIC_SURROGATE, attBasicSurrBuff);
                SAFE_DELETE(attBasicSurrBuff);
                SAFE_DELETE(getAttBasicSurrInfoBuff);
+               SAFE_DELETE(getAttBasicSurrInfoTlv);
        }
        else {
 
@@ -110,6 +113,7 @@ RegAuthAssertionTlvEncoder::decode(const unsigned char *rawData)
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
        if (root->tag != TAG_UAFV1_REG_ASSERTION) {
+               SAFE_DELETE(root->val);
                SAFE_DELETE(root);
                return NULL;
        }

diff --git a/common/uafv1tlvutil/src/RegReqTlvEncoder.cpp b/common/uafv1tlvutil/src/RegReqTlvEncoder.cpp
index 0f7b4c2..3226efd 100644 (file)
--- a/common/uafv1tlvutil/src/RegReqTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/RegReqTlvEncoder.cpp
@@ -88,6 +88,7 @@ RegAssertionTlvEncoder::decode(const unsigned char *rawData)
        tlv_s* root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
        if (root->tag != TAG_UAFV1_REGISTER_CMD) {
+               SAFE_DELETE(root->val);
                SAFE_DELETE(root);
                return NULL;
        }

diff --git a/common/uafv1tlvutil/src/RegRespTlvEncoder.cpp b/common/uafv1tlvutil/src/RegRespTlvEncoder.cpp
index a72c8a4..ef1322e 100644 (file)
--- a/common/uafv1tlvutil/src/RegRespTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/RegRespTlvEncoder.cpp
@@ -74,6 +74,7 @@ RegRespTlvEncoder::decode(const unsigned char *rawData)
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
        if (root->tag != TAG_UAFV1_REGISTER_CMD_RESPONSE) {
+               SAFE_DELETE(root->val);
                SAFE_DELETE(root);
                return NULL;
        }

diff --git a/common/uafv1tlvutil/src/SignAuthAssertionTlvEncoder.cpp b/common/uafv1tlvutil/src/SignAuthAssertionTlvEncoder.cpp
index cb08bcf..1032219 100644 (file)
--- a/common/uafv1tlvutil/src/SignAuthAssertionTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/SignAuthAssertionTlvEncoder.cpp
@@ -53,6 +53,7 @@ SignAuthAssertionTlvEncoder::encode(const void *authData)
 
                tlv_builder_add_buffer(builder, TAG_UAFV1_SIGNED_DATA, getSigDataBuff);
                SAFE_DELETE(getSigDataBuff);
+               SAFE_DELETE(getSigDataInfoTlv);
 
                /*1.2 end*/
        }
@@ -78,7 +79,11 @@ SignAuthAssertionTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_UAFV1_AUTH_ASSERTION, NULL);
+       if (root->tag != TAG_UAFV1_AUTH_ASSERTION) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        AuthAssertion *getAuthAssInfo = ALLOC(AuthAssertion);

diff --git a/common/uafv1tlvutil/src/SignReqTlvEncoder.cpp b/common/uafv1tlvutil/src/SignReqTlvEncoder.cpp
index 42c6de3..65c82fe 100644 (file)
--- a/common/uafv1tlvutil/src/SignReqTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/SignReqTlvEncoder.cpp
@@ -100,7 +100,11 @@ SignReqTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s *root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_UAFV1_SIGN_CMD, NULL);
+       if (root->tag != TAG_UAFV1_SIGN_CMD) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        int endIter = rawIter + root->len;

diff --git a/common/uafv1tlvutil/src/Uafv1KrdTlvEncoder.cpp b/common/uafv1tlvutil/src/Uafv1KrdTlvEncoder.cpp
index e040fae..d70db73 100644 (file)
--- a/common/uafv1tlvutil/src/Uafv1KrdTlvEncoder.cpp
+++ b/common/uafv1tlvutil/src/Uafv1KrdTlvEncoder.cpp
@@ -89,7 +89,11 @@ Uafv1KrdTlvEncoder::decode(const unsigned char *rawData)
 
        tlv_s* root = tlv_decode(rawData);
        RET_IF_FAIL(root != NULL, NULL);
-       RET_IF_FAIL(root->tag == TAG_UAFV1_KRD, NULL);
+       if (root->tag != TAG_UAFV1_KRD) {
+               SAFE_DELETE(root->val);
+               SAFE_DELETE(root);
+               return NULL;
+       }
 
        int rawIter = 2 + 2;
        int endIter = rawIter + root->len;

diff --git a/common/uiutil/src/PinAuthUiAdaptor.cpp b/common/uiutil/src/PinAuthUiAdaptor.cpp
index f8c436c..38f0d62 100644 (file)
--- a/common/uiutil/src/PinAuthUiAdaptor.cpp
+++ b/common/uiutil/src/PinAuthUiAdaptor.cpp
@@ -105,7 +105,6 @@ PinAuthUiAdaptor::getTokenFromUi(pin_auth_mode_e type, const std::string& appId,
        for (int i = 0; i < 10; i++) {
                uiPid = aul_launch_app_for_uid(ASM_UI_APP_NAME, b, OWNER_UID);
                _INFO("aul_launch_app = [%d]", uiPid);
-               bundle_free(b);
                if (uiPid < 0) {
                        if (uiPid == AUL_R_EINVAL)
                                _INFO("AUL_R_EINVAL");
@@ -122,6 +121,8 @@ PinAuthUiAdaptor::getTokenFromUi(pin_auth_mode_e type, const std::string& appId,
                }
        }
 
+       bundle_free(b);
+
        if (uiPid < 0) {
                *err = -1;
                return "";