Fix savce issue from SVACE tool version 2.2

Change-Id: I47ab2d2e51ab001ebd60cae917f35fc8fd821b15

diff --git a/packaging/libtcore.spec b/packaging/libtcore.spec
index 70ad9cc..7356bcd 100644 (file)
--- a/packaging/libtcore.spec
+++ b/packaging/libtcore.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 6
+%define patchlevel 7
 
 Name:           libtcore
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/core_object/co_sat.c b/src/core_object/co_sat.c
index bfde190..1855450 100644 (file)
--- a/src/core_object/co_sat.c
+++ b/src/core_object/co_sat.c
@@ -327,7 +327,6 @@ static void _sat_decode_dcs(unsigned char dcs, struct data_coding_scheme *dsc_ob
                break;
 
                default:
-                       err("invalid dcs type");
                break;
                }
        }
@@ -1933,11 +1932,13 @@ static enum tcore_sat_result _sat_decode_url_tlv(unsigned char *tlv_str, int tlv
        temp_index += len_of_len; /* temp_index pointing to url. */
        dbg("URL length (%d)", url_len);
 
+#if 0 /*unreachable code from svace 2.2 */
        if (url_len < 0) {
                dbg("[SAT] URL is null");
                *consumed_data_len = 1 + len_of_len + url_len;
                return TCORE_SAT_SUCCESS;
        }
+#endif
 
        if (url_len > SAT_URL_LEN_MAX) {
                dbg("[SAT] URL length is wrong");

diff --git a/src/server.c b/src/server.c
index b9fc4c8..bd2b519 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -720,7 +720,7 @@ TReturn tcore_server_remove_notification_hook(Server *s,
        struct hook_notification_type *hook;
        GSList *list;
 
-       if (!s)
+       if ((s == NULL) || (s->hook_list_notification == NULL))
                return TCORE_RETURN_EINVAL;
 
        for (list = s->hook_list_notification; list; list = list->next) {