Fix svace defect

wgid: 30891, 99720

Change-Id: I2ae5ea6c4d8f08fbc7737f677794705af16aba17
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/vcore/vcore/Client.cpp b/vcore/vcore/Client.cpp
index cdb1954..6767ca8 100644 (file)
--- a/vcore/vcore/Client.cpp
+++ b/vcore/vcore/Client.cpp
@@ -68,12 +68,10 @@ void initialize_req_data(VcoreRequestData *pData)
 
 CertSvcStoreCertList *createStoreListNode(VcoreCertResponseData *cert)
 {
-       CertSvcStoreCertList *node = NULL;
-
-       if (cert == NULL || cert->gname == NULL || cert->title == NULL)
+       if (cert == NULL)
                return NULL;
 
-       node = (CertSvcStoreCertList *)malloc(sizeof(CertSvcStoreCertList));
+       CertSvcStoreCertList *node = (CertSvcStoreCertList *)malloc(sizeof(CertSvcStoreCertList));
 
        if (node == NULL)
                return NULL;

diff --git a/vcore/vcore/api.cpp b/vcore/vcore/api.cpp
index 902aa8c..6d125bf 100644 (file)
--- a/vcore/vcore/api.cpp
+++ b/vcore/vcore/api.cpp
@@ -1610,7 +1610,6 @@ int certsvc_get_certificate(CertSvcInstance instance,
                        if (fwrite(certBuffer, sizeof(char), length, fp_write) != length) {
                                LogError("Fail to write certificate.");
                                result = CERTSVC_FAIL;
-                               fclose(fp_write);
                                goto error;
                        }
 
@@ -1618,24 +1617,26 @@ int certsvc_get_certificate(CertSvcInstance instance,
 
                        if (result != CERTSVC_SUCCESS) {
                                LogError("Failed to construct certificate from buffer.");
-                               fclose(fp_write);
                                goto error;
                        }
 
-                       fclose(fp_write);
                        unlink(fileName.c_str());
                }
 
                result = CERTSVC_SUCCESS;
        } catch (std::bad_alloc &) {
-               return CERTSVC_BAD_ALLOC;
+               result = CERTSVC_BAD_ALLOC;
        } catch (...) {}
 
 error:
+       if (x509Struct)
+               X509_free(x509Struct);
 
-       if (x509Struct) X509_free(x509Struct);
+       if (pBio)
+               BIO_free(pBio);
 
-       if (pBio) BIO_free(pBio);
+       if (fp_write)
+               fclose(fp_write);
 
        return result;
 }