Fix the exception handling

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

diff --git a/src/keyval.c b/src/keyval.c
index 8c7a42f..e3f906a 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"
@@ -247,12 +248,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);