increase code quality(static analysis)

Change-Id: I8e5282c46664bc2a5e257f9aa3588471942cceee

diff --git a/server/auth_discovery/src/AuthIndexHanlder.cpp b/server/auth_discovery/src/AuthIndexHanlder.cpp
index d332590..54c4f4d 100755 (executable)
--- a/server/auth_discovery/src/AuthIndexHanlder.cpp
+++ b/server/auth_discovery/src/AuthIndexHanlder.cpp
@@ -40,21 +40,25 @@ AuthIndexHandler::getMappedIndex(const std::string& devId, const std::string& aa
        searchParcel->setString(STR_PROP_AAID, aaid.c_str());
 
        std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
-       if (searchRes != NULL && searchRes->size() > 0) {
-               _INFO("Previously mapped index");
+       if (searchRes != NULL) {
+               if (0 < searchRes->size()) {
+                       _INFO("Previously mapped index");
 
-               std::vector<IStorageParcel*>::iterator searchResiter = searchRes->begin();
-               IStorageParcel *resParcel = (IStorageParcel*)(*searchResiter);
+                       std::vector<IStorageParcel*>::iterator searchResiter = searchRes->begin();
+                       IStorageParcel *resParcel = (IStorageParcel*)(*searchResiter);
 
-               int mappedIndex = authIndex;
-               resParcel->getInt(INT_PROP_MAPPED_AUTH_ID, &mappedIndex);
+                       int mappedIndex = authIndex;
+                       resParcel->getInt(INT_PROP_MAPPED_AUTH_ID, &mappedIndex);
 
-               _INFO("Mapped Index=[%d]", mappedIndex);
-               for (; searchResiter != searchRes->end(); ++searchResiter) {
-                       delete *searchResiter;
+                       _INFO("Mapped Index=[%d]", mappedIndex);
+                       for (; searchResiter != searchRes->end(); ++searchResiter) {
+                               delete *searchResiter;
+                       }
+                       searchRes->clear();
+                       delete searchRes;
+                       return mappedIndex;
                }
-               searchRes->clear();
-               return mappedIndex;
+               delete searchRes;
        } else {
                _INFO("New index");
 
@@ -80,6 +84,7 @@ AuthIndexHandler::getMappedIndex(const std::string& devId, const std::string& aa
                                delete *searchResiter;
                        }
                        searchResInner->clear();
+                       delete searchResInner;
                        return mappedIndex;
                }
        }
@@ -99,7 +104,6 @@ AuthIndexHandler::getAuthIndex(int mappedIndex)
        IStorageParcel *searchParcel = new AuthStorageParcel();
        searchParcel->setInt(INT_PROP_MAPPED_AUTH_ID, mappedIndex);
 
-
        std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
        if (searchRes != NULL) {
                std::vector<IStorageParcel*>::iterator searchResiter = searchRes->begin();
@@ -113,6 +117,7 @@ AuthIndexHandler::getAuthIndex(int mappedIndex)
                        delete *searchResiter;
                }
                searchRes->clear();
+               delete searchRes;
                return authIndex;
        }
 

diff --git a/server/states/src/AuthenticateState.cpp b/server/states/src/AuthenticateState.cpp
index 95b1c08..d1573bb 100755 (executable)
--- a/server/states/src/AuthenticateState.cpp
+++ b/server/states/src/AuthenticateState.cpp
@@ -188,8 +188,8 @@ AuthenticateState::createStubRequestSign(AsmRequest *asmReq, const char *vTok)
 
                                searchParcel->setString(STR_PROP_APP_ID, asmSignReq->getAppId());
                                searchParcel->setString(STR_PROP_KEY_ID, kIdStr);
-                               std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
 
+                               std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
                                if (searchRes != NULL) {
                                        _INFO("AuthenticateState::createStubRequestSign:: Records found in database corresponding to keyId = [%d]", searchRes->size());
                                        std::vector<IStorageParcel*>::iterator searchResIter = searchRes->begin();
@@ -208,6 +208,12 @@ AuthenticateState::createStubRequestSign(AsmRequest *asmReq, const char *vTok)
                                                }
                                        }
                                        signAuthReq->khHList = g_list_first(signAuthReq->khHList);
+                                       searchResIter = searchRes->begin();
+                                       for (; searchResIter != searchRes->end(); ++searchResIter) {
+                                               delete *searchResIter;
+                                       }
+                                       searchRes->clear();
+                                       delete searchRes;
                                }
                        }
                } else {
@@ -215,8 +221,8 @@ AuthenticateState::createStubRequestSign(AsmRequest *asmReq, const char *vTok)
                        IStorageParcel *searchParcel = new AsmStorageParcel();
 
                        searchParcel->setString(STR_PROP_APP_ID, asmSignReq->getAppId());
-                       std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
 
+                       std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
                        if (searchRes != NULL) {
                                _INFO("AuthenticateState::createStubRequestSign::Records found in database corresponding to appId = [%d]", searchRes->size());
                                std::vector<IStorageParcel*>::iterator searchResIter = searchRes->begin();
@@ -272,8 +278,8 @@ AuthenticateState::handle(IAuthStub *stub, AsmRequest *asmReq, const char *str,
 
                        std::string appIdStr(signAuthReq->appId);
                        searchParcel->setString(STR_PROP_APP_ID, appIdStr);
-                       std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
 
+                       std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
                        if (searchRes != NULL) {
                                int recFound = searchRes->size();
                                _INFO("Records found in database corresponding to appId = [%d]", recFound);
@@ -301,12 +307,12 @@ AuthenticateState::handle(IAuthStub *stub, AsmRequest *asmReq, const char *str,
                                        delete *searchResIter;
                                }
                                searchRes->clear();
+                               delete searchRes;
                        }
-
                } else {
                        /* RA mode, Client dev ASM sends keyID as keyHandle, so we need to get the
                         * actual keyHandle from storage (search key = keyID)
-                       */
+                        */
 
                        IStorageParcel *searchParcel = new AsmStorageParcel();
                        std::string appIdStr(signAuthReq->appId);
@@ -316,40 +322,41 @@ AuthenticateState::handle(IAuthStub *stub, AsmRequest *asmReq, const char *str,
                        GList *recvdKhListIter = g_list_first(signAuthReq->khHList);
 
                        while (recvdKhListIter != NULL) {
-                                       char *recvKh = (char*)(recvdKhListIter->data);
-                                       unsigned char *recvKhDec = AsmCrypto::ToBase64Url((unsigned char*)recvKh, strlen(recvKh));
-                                       if (recvKhDec != NULL) {
-                                               std::string kIdStr((char*)recvKhDec);
-                                               SAFE_DELETE(recvKhDec);
-                                               searchParcel->setString(STR_PROP_KEY_ID, kIdStr);
-                                               _INFO("search=[%s][%s]", appIdStr.c_str(), kIdStr.c_str());
-
-                                               std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
-                                               if (searchRes != NULL) {
-                                                       int recFound = searchRes->size();
-                                                       _INFO("Records found in database corresponding to appId = [%d]", recFound);
-                                                       if (recFound <= 0) {
-                                                               _INFO("No key registered for this app");
-                                                       }
+                               char *recvKh = (char*)(recvdKhListIter->data);
+                               unsigned char *recvKhDec = AsmCrypto::ToBase64Url((unsigned char*)recvKh, strlen(recvKh));
+                               if (recvKhDec != NULL) {
+                                       std::string kIdStr((char*)recvKhDec);
+                                       SAFE_DELETE(recvKhDec);
+                                       searchParcel->setString(STR_PROP_KEY_ID, kIdStr);
+                                       _INFO("search=[%s][%s]", appIdStr.c_str(), kIdStr.c_str());
+
+                                       std::vector<IStorageParcel*> *searchRes = AsmStorage::getInstance()->searchData(searchParcel);
+                                       if (searchRes != NULL) {
+                                               int recFound = searchRes->size();
+                                               _INFO("Records found in database corresponding to appId = [%d]", recFound);
+                                               if (recFound <= 0) {
+                                                       _INFO("No key registered for this app");
+                                               }
 
-                                                       std::vector<IStorageParcel*>::iterator searchResIter = searchRes->begin();
+                                               std::vector<IStorageParcel*>::iterator searchResIter = searchRes->begin();
 
-                                                       for (; searchResIter != searchRes->end(); ++searchResIter) {
-                                                               IStorageParcel *parcel = *searchResIter;
-                                                               char *kh = NULL;
-                                                               int res = parcel->getString(STR_PROP_KEY_HANDLE, &kh);
+                                               for (; searchResIter != searchRes->end(); ++searchResIter) {
+                                                       IStorageParcel *parcel = *searchResIter;
+                                                       char *kh = NULL;
+                                                       int res = parcel->getString(STR_PROP_KEY_HANDLE, &kh);
 
-                                                               if (res == 0) {
-                                                                       _INFO("Length of b64 encoded keyHandle : [%d]", strlen(kh));
-                                                                       storedKhList = g_list_append(storedKhList, kh);
-                                                               }
+                                                       if (res == 0) {
+                                                               _INFO("Length of b64 encoded keyHandle : [%d]", strlen(kh));
+                                                               storedKhList = g_list_append(storedKhList, kh);
                                                        }
-                                                       searchResIter = searchRes->begin();
-                                                       for (; searchResIter != searchRes->end(); ++searchResIter) {
-                                                               delete *searchResIter;
-                                                       }
-                                                       searchRes->clear();
                                                }
+                                               searchResIter = searchRes->begin();
+                                               for (; searchResIter != searchRes->end(); ++searchResIter) {
+                                                       delete *searchResIter;
+                                               }
+                                               searchRes->clear();
+                                               delete searchRes;
+                                       }
                                }
 
                                recvdKhListIter = recvdKhListIter->next;
@@ -404,6 +411,7 @@ AuthenticateState::handle(IAuthStub *stub, AsmRequest *asmReq, const char *str,
                                                                delete *searchResIter;
                                                        }
                                                        searchRes->clear();
+                                                       delete searchRes;
                                                }
                                        }
                                        recvdKhListIter = recvdKhListIter->next;

diff --git a/silent_auth/silent_auth_entry.cpp b/silent_auth/silent_auth_entry.cpp
index 2bd238f..32c4687 100755 (executable)
--- a/silent_auth/silent_auth_entry.cpp
+++ b/silent_auth/silent_auth_entry.cpp
@@ -782,6 +782,8 @@ processRegister(unsigned char *assert_req)
        _INFO("After AESEncrypt, length = [%d]", kh_str_enc_len);
        if (kh_str_enc_len > 0) {
                kh_str_enc[kh_str_enc_len] = '\0';
+       } else {
+               kh_str_enc_len = 0;
        }
 
        unsigned char digest[32];
@@ -796,7 +798,7 @@ processRegister(unsigned char *assert_req)
        /*b64 encode of keyId*/
 
        getRegRespInfo->kh = ALLOC(Buffer);
-       getRegRespInfo->kh->data = NALLOC(kh_str_enc_len, uint8_t);;
+       getRegRespInfo->kh->data = NALLOC(kh_str_enc_len, uint8_t);
        memcpy(getRegRespInfo->kh->data, kh_str_enc, kh_str_enc_len);
        getRegRespInfo->kh->len = kh_str_enc_len;