Check for null-termination of strings

[platform/core/base/bundle.git] / src / keyval.c

diff --git a/src/keyval.c b/src/keyval.c
index 8c7a42f..d49be0e 100755 (executable)
--- a/src/keyval.c
+++ b/src/keyval.c
@@ -19,6 +19,7 @@
  * Implementation of keyval object
  */
 
+#define _GNU_SOURCE
 #include <stdlib.h>
 
 #include "keyval_type.h"
@@ -38,6 +39,7 @@ keyval_t *keyval_new(keyval_t *kv, const char *key,
                const int type, const void *val, const size_t size)
 {
        int must_free_obj = kv ? 0 : 1;
+       char *str;
 
        if (!kv) {
                kv = calloc(1, sizeof(keyval_t));
@@ -69,8 +71,14 @@ keyval_t *keyval_new(keyval_t *kv, const char *key,
                        keyval_free(kv, must_free_obj);
                        return NULL;
                }
-               if (val)
+               if (val) {
                        memcpy(kv->val, val, size);
+                       if (type == BUNDLE_TYPE_STR) {
+                               str = (char *)kv->val;
+                               if (str[size - 1] != '\0')
+                                       str[size - 1] = '\0';
+                       }
+               }
        }
 
        kv->method = &method;
@@ -247,12 +255,13 @@ size_t keyval_decode(unsigned char *byte, keyval_t **kv, size_t byte_size)
        byte_size -= sz_keysize;
        p += sz_keysize;
        key = (char *)p;
-       if ((strlen(key) + 1) != keysize)
-               return 0;
 
        if (byte_size < keysize)
                return 0;
 
+       if (!key || (strnlen(key, keysize) + 1) != keysize)
+               return 0;
+
        byte_size -= keysize;
        p += keysize;
        size = *((size_t *)p);