Fixed codes which may occur potential bugs.

- check null pointer
- fix double close

Change-Id: I7baacb4d01d74a883ef969e43a14035ee89307a1
Signed-off-by: shingil.kang <shingil.kang@samsung.com>

diff --git a/src/properties.c b/src/properties.c
index dc76a69..1127655 100644 (file)
--- a/src/properties.c
+++ b/src/properties.c
@@ -69,16 +69,17 @@ static void property_init(void)
         if(read_line(fd, buffer, PROPERTY_KEY_MAX+PROPERTY_VALUE_MAX+1) < 0)
             break;
         tok = strtok_r(buffer, PROPERTY_SEPARATOR, &ptr);
-        for (i = 0; i < sdbd_config_element_cnt && sdbd_config[i].key ; i++) {
-            if (!strcmp(tok, sdbd_config[i].key)) {
-                tok = strtok_r(NULL, PROPERTY_SEPARATOR, &ptr);
-                if(tok) {
-                    snprintf(sdbd_config[i].value, PROPERTY_VALUE_MAX, "%s", tok);
-                    D("property init key=%s, value=%s\n", sdbd_config[i].key, tok);
+        if(tok) {
+            for (i = 0; i < sdbd_config_element_cnt && sdbd_config[i].key ; i++) {
+                if (!strcmp(tok, sdbd_config[i].key)) {
+                    tok = strtok_r(NULL, PROPERTY_SEPARATOR, &ptr);
+                    if(tok) {
+                        snprintf(sdbd_config[i].value, PROPERTY_VALUE_MAX, "%s", tok);
+                        D("property init key=%s, value=%s\n", sdbd_config[i].key, tok);
+                    }
                 }
             }
         }
-
     }
     sdb_close(fd);
     D("called property_init\n");

diff --git a/src/services.c b/src/services.c
index 33c5c76..e2b5928 100644 (file)
--- a/src/services.c
+++ b/src/services.c
@@ -782,7 +782,6 @@ static int create_sync_subprocess(void (*func)(int, void *), void* cookie) {
     if(sdb_thread_create( &t, service_bootstrap_func, sti)){
         free(sti);
         sdb_close(s[0]);
-        sdb_close(s[1]);
         printf("cannot create service monitor thread\n");
         return -1;
     }