Fix non-turminated strings

WGID-259958, 260202, 260346, 260557, 260674, 260675, 260676, 260774,
260863, 260923

Change-Id: Iaf9c28d99510687e71f4b9d55199a4d605e17796
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/oma-parser/oma-parser-common.c b/oma-parser/oma-parser-common.c
index 7cea707fb7faac6dfdb904920a33e890a4986738..bdf2ed4916a12f53293eae611875a6b53a07184b 100755 (executable)
--- a/oma-parser/oma-parser-common.c
+++ b/oma-parser/oma-parser-common.c
@@ -30,7 +30,7 @@ static amp_character_table amp_table[] = {
                {">", '>'},
                {""", '\"'},
                {"'", '\''},
-               {OP_NULL, ' '}};
+               {OP_NULL, ' '} };
 
 int op_com_util_remove_blankspace(char *Source, int srcLen)
 {
@@ -68,7 +68,7 @@ ERR:
 }
 
 int op_com_util_resolve_version(char *source, int *major, int *minor,
-                int *micro)
+               int *micro)
 {
        int ret = OP_RESULT_OK;
        int ma = 0;
@@ -197,11 +197,12 @@ int op_com_utils_is_number(const char *source)
 char *op_com_utils_concat(char *source, char *substring)
 {
        char *ret_str = NULL;
+       size_t ret_str_len = strlen(source) + strlen(substring) + 1;
 
-       ret_str = (char*)calloc(1, strlen(source) + strlen(substring) + 1);
+       ret_str = (char*)calloc(1, ret_str_len);
        if (OP_NULL != ret_str) {
-               strncpy(ret_str, source, strlen(source));
-               strncat(ret_str, substring, strlen(substring));
+               strncpy(ret_str, source, strlen(source) + 1);
+               strncat(ret_str, substring, ret_str_len - strlen(ret_str) - 1);
        }
 
        return ret_str;

diff --git a/oma-parser/oma-parser-dd1.c b/oma-parser/oma-parser-dd1.c
index 7a11c9975bfbfefd1daa4e1e869f2f1d001e7729..cd034357348504999808afab30932e82024c45fa 100644 (file)
--- a/oma-parser/oma-parser-dd1.c
+++ b/oma-parser/oma-parser-dd1.c
@@ -74,7 +74,7 @@ int op_parse_dd1_file(xmlSAXHandler *sHandlerPtr, op_parser_app_data_t **app_dat
 
        app_data_local = (op_parser_app_data_t *)calloc(1,
                        sizeof(op_parser_app_data_t));
-       if (OP_NULL == app_data) {
+       if (OP_NULL == app_data_local) {
                OP_LOGE("MEMORY ALLOCATION FAIL");
                ret = OP_ERR_FAIL_TO_MEMALLOC;
                goto ERR;
@@ -424,7 +424,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                strncat(dd_info->name, ch_str, OP_MAX_URI_LEN
                                                - strlen(dd_info->name) - 1);
                        } else if (strlen(ch_str) < OP_MAX_STR_LEN) {
-                               strncpy(dd_info->name, ch_str, strlen(ch_str));
+                               strncpy(dd_info->name, ch_str, strlen(ch_str) + 1);
                        }
 
                        OP_SLOG("dd_info->name:[%s]", dd_info->name);
@@ -458,7 +458,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        app_data->parseError = OP_ERR_FAIL_TO_MEMALLOC;
                                        goto ERR;
                                }
-                               strncpy(dd_info->vendor, ch_str, strlen(ch_str));
+                               strncpy(dd_info->vendor, ch_str, strlen(ch_str) + 1);
                        }
 
                        OP_SLOG("dd_info->vendor:[%s]", dd_info->vendor);
@@ -483,7 +483,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        goto ERR;
                                }
                                strncpy(dd_info->install_notify_uri,
-                                               (const char*)ch_str, strlen(ch_str));
+                                               (const char*)ch_str, strlen(ch_str) + 1);
                        }
                        OP_SLOG("dd_info->install_notify_uri:[%s]",
                                        dd_info->install_notify_uri);
@@ -508,7 +508,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        goto ERR;
                                }
                                strncpy(dd_info->description,
-                                               (const char*)ch_str, strlen(ch_str));
+                                               (const char*)ch_str, strlen(ch_str) + 1);
                        }
                        OP_SLOG("dd_info->description:[%s]",
                                        dd_info->description);
@@ -535,7 +535,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        goto ERR;
                                }
                                strncpy(dd_info->midlet_info_url,
-                                               (const char*)ch_str, strlen(ch_str));
+                                               (const char*)ch_str, strlen(ch_str) + 1);
                        }
                        OP_SLOG("dd_info->midlet_info_url:[%s]",
                                        dd_info->midlet_info_url);
@@ -562,7 +562,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        goto ERR;
                                }
                                strncpy(dd_info->icon_uri, (const char*)ch_str,
-                                               strlen(ch_str));
+                                               strlen(ch_str) + 1);
                                OP_SLOG("dd_info->icon_uri:[%s]",
                                                dd_info->icon_uri);
                        }
@@ -588,7 +588,7 @@ void op_libxml_characters_dd1(void *userData, const xmlChar *s, int len)
                                        goto ERR;
                                }
                                strncpy(dd_info->next_url, (const char*)ch_str,
-                                               strlen(ch_str));
+                                               strlen(ch_str) + 1);
                        }
 
                        OP_SLOG("dd_info->next_url:[%s]",

diff --git a/packaging/org.tizen.download-manager.spec b/packaging/org.tizen.download-manager.spec
index 4dc517a4820685c524530f3eb02d74804d28851e..9d21539594ff632987dfba2344edabaa7f261d87 100755 (executable)
--- a/packaging/org.tizen.download-manager.spec
+++ b/packaging/org.tizen.download-manager.spec
@@ -1,7 +1,7 @@
 %define _ux_define tizen2.3
 Name:  org.tizen.download-manager
 Summary:       Application for support of the content download
-Version:       0.3.26
+Version:       0.3.27
 Release:       1
 License:       Flora-1.1
 Group:         misc