Add return value handle logic about db operation

* sqlite3_step()'s return value will be either
* SQLITE_BUSY, SQLITE_DONE, SQLITE_ROW ...

[ AS-IS ]
* Only handle SQLITE_DONE and SQLITE_ROW.
[ TO-BE ]
* Handle whole possible return value.

ref) https://www.sqlite.org/capi3ref.html#sqlite3_step

Change-Id: Ibe333545a8ca94428bce474c60e2ef7f4fe5a910
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
(cherry picked from commit 69bc9bdeaec09f8d9b1c6197708ecb1f9110656e)

diff --git a/src/server/src/cert-server-logic.c b/src/server/src/cert-server-logic.c
index 9cd56da..970239b 100644 (file)
--- a/src/server/src/cert-server-logic.c
+++ b/src/server/src/cert-server-logic.c
@@ -1449,113 +1449,109 @@ int loadCertificatesFromStore(
        size_t *bufferLen,
        size_t *certBlockCount)
 {
-       int result = CERTSVC_SUCCESS;
-       size_t count = 0;
-       int records = 0;
        sqlite3_stmt *stmt = NULL;
-       char *query = NULL;
        char **certs = NULL;
-       const char *tmpText = NULL;
-       size_t i = 0;
-
-       query = sqlite3_mprintf("select associated_gname from %Q where gname=%Q",
-                       storetype_to_string(storeType), gname);
+       size_t gnameSize = 0;
 
-       result = execute_select_query(query, &stmt);
+       /* Get associated_gname from store */
+       char *query = sqlite3_mprintf("select associated_gname from %Q "
+                                                                 "where gname=%Q",
+                                                                  storetype_to_string(storeType),
+                                                                  gname);
+       int result = execute_select_query(query, &stmt);
        if (result != CERTSVC_SUCCESS) {
                SLOGE("Querying database failed.");
+               goto error;
+       }
+
+       int records = sqlite3_step(stmt);
+       if (records != SQLITE_ROW) {
+               SLOGE("No valid records found for gname passed [%s].", gname);
                result = CERTSVC_FAIL;
                goto error;
        }
 
-       records = sqlite3_step(stmt);
-       if (records != SQLITE_ROW || records == SQLITE_DONE) {
-               SLOGE("No valid records found for gname passed [%s].",gname);
+       const char *columnText = (const char *)sqlite3_column_text(stmt, 0);
+       if (!columnText) {
+               SLOGE("Failed to sqlite3_column_text");
                result = CERTSVC_FAIL;
                goto error;
        }
+       sqlite3_free(query);
+       sqlite3_finalize(stmt);
 
+       /* Get gnames from store */
+       query = sqlite3_mprintf("select gname from %Q "
+                                                       "where associated_gname=%Q and enabled=%d and "
+                                                       "is_root_app_enabled=%d",
+                                                       storetype_to_string(storeType),
+                                                       columnText,
+                                                       ENABLED,
+                                                       ENABLED);
+       result = execute_select_query(query, &stmt);
+       if (result != CERTSVC_SUCCESS) {
+               SLOGE("Querying database failed.");
+               goto error;
+       }
 
-       if (records == SQLITE_ROW) {
-               if (query)
-                       sqlite3_free(query);
+       certs = (char**)malloc(4 * sizeof(char *));
+       if (!certs) {
+               SLOGE("Failed to allocate memory.");
+               result = CERTSVC_BAD_ALLOC;
+               goto error;
+       }
+       memset(certs, 0x00, 4 * sizeof(char *));
+
+       while (1) {
+               records = sqlite3_step(stmt);
+               if (records == SQLITE_DONE)
+                       break;
 
-               const char *columnText = (const char *)sqlite3_column_text(stmt, 0);
-               if (!columnText) {
-                       SLOGE("Failed to sqlite3_column_text");
+               if (records != SQLITE_ROW) {
+                       SLOGE("Querying database failed.");
                        result = CERTSVC_FAIL;
                        goto error;
                }
 
-               query = sqlite3_mprintf("select gname from %Q where associated_gname=%Q and enabled=%d and is_root_app_enabled=%d",
-                               storetype_to_string(storeType), columnText, ENABLED, ENABLED);
-
-               if (stmt)
-                       sqlite3_finalize(stmt);
-
-               result = execute_select_query(query, &stmt);
-               if (result != CERTSVC_SUCCESS) {
-                       SLOGE("Querying database failed.");
+               const char *tmpText = (const char *)sqlite3_column_text(stmt, 0);
+               if (!tmpText) {
+                       SLOGE("Failed to sqlite3_column_text.");
                        result = CERTSVC_FAIL;
                        goto error;
                }
 
-               while (1) {
-                       records = sqlite3_step(stmt);
-                       if (records != SQLITE_ROW || records == SQLITE_DONE)
-                               break;
-
-                       if (count == 0) {
-                               certs = (char**) malloc(4 * sizeof(char *));
-                               if (!certs) {
-                                       SLOGE("Failed to allocate memory");
-                                       result = CERTSVC_BAD_ALLOC;
-                                       goto error;
-                               }
-                               memset(certs, 0x00, 4 * sizeof(char *));
-                       }
-
-                       if (records == SQLITE_ROW) {
-                               tmpText = (const char *)sqlite3_column_text(stmt, 0);
-                               if (!tmpText) {
-                                       SLOGE("Failed to sqlite3_column_text.");
-                                       result = CERTSVC_FAIL;
-                                       goto error;
-                               }
-
-                               if (!((certs)[count] = strdup(tmpText))) {
-                                       SLOGE("Failed to allocate memory");
-                                       result = CERTSVC_BAD_ALLOC;
-                                       goto error;
-                               }
-                       }
-
-                       count++;
+               if (!((certs)[gnameSize++] = strdup(tmpText))) {
+                       SLOGE("Failed to allocate memory");
+                       result = CERTSVC_BAD_ALLOC;
+                       goto error;
                }
+       }
 
-               if (count == 0) {
-                       SLOGE("No valid records found for the gname passed [%s].",gname);
-                       return CERTSVC_FAIL;
-               }
+       if (gnameSize == 0) {
+               SLOGE("No valid records found for the gname passed [%s].",gname);
+               result = CERTSVC_FAIL;
+               goto error;
        }
 
-       *certBlockCount = count;
-       *bufferLen = count * sizeof(ResponseCertBlock);
-       ResponseCertBlock *certBlockList = (ResponseCertBlock *) malloc(*bufferLen);
+       *certBlockCount = gnameSize;
+       *bufferLen = gnameSize * sizeof(ResponseCertBlock);
+
+       ResponseCertBlock *certBlockList = (ResponseCertBlock *)malloc(*bufferLen);
        if (!certBlockList) {
                SLOGE("Failed to allocate memory for ResponseCertBlock");
                result = CERTSVC_BAD_ALLOC;
                goto error;
        }
-
-       if (count > 0)
-               memset(certBlockList, 0x00, *bufferLen);
+       memset(certBlockList, 0x00, *bufferLen);
 
        ResponseCertBlock *currentBlock = NULL;
-       for (i = 0; i < count; i++) {
+       size_t i;
+       for (i = 0; i < gnameSize; i++) {
                currentBlock = certBlockList + i;
                if (sizeof(currentBlock->dataBlock) < strlen(certs[i])) {
-                       SLOGE("src is longer than dst. src[%s] dst size[%d]", certs[i], sizeof(currentBlock->dataBlock));
+                       SLOGE("src is longer than dst. src[%s] dst size[%d]",
+                                 certs[i],
+                                 sizeof(currentBlock->dataBlock));
                        free(certBlockList);
                        result = CERTSVC_FAIL;
                        goto error;
@@ -1567,7 +1563,7 @@ int loadCertificatesFromStore(
 
        result = CERTSVC_SUCCESS;
 
-       SLOGD("success: loadCertificatesFromStore. CERT_COUNT=%d", count);
+       SLOGD("success: loadCertificatesFromStore. CERT_COUNT=%d", gnameSize);
 
 error:
        if (query)
@@ -1577,7 +1573,7 @@ error:
                sqlite3_finalize(stmt);
 
        if (certs) {
-               for(i = 0; i < count; i++)
+               for(i = 0; i < gnameSize; i++)
                        free(certs[i]);
 
                free(certs);