fix windows code analysis problems

diff --git a/libs/esl/src/esl.c b/libs/esl/src/esl.c
index 675ecee46007744231e9b41b750d0703b5926e85..def0346c499f7df1333bc8bddeddc253c7c55de5 100644 (file)
--- a/libs/esl/src/esl.c
+++ b/libs/esl/src/esl.c
@@ -1053,6 +1053,7 @@ static int add_array(esl_event_t *event, const char *var, const char *val)
        data = strdup(val + 7);
        
        len = (sizeof(char *) * max) + 1;
+       esl_assert(len == 0);
        array = malloc(len);
        memset(array, 0, len);
        

diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index 614d1b6190e04251c24268db7fed72b95bc27359..65dd816369c38edcbf7a2fd3254571542ec96692 100644 (file)
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -298,7 +298,7 @@ ESL_DECLARE(esl_status_t) esl_event_del_header_val(esl_event_t *event, const cha
                esl_assert(x < 1000000);
                hash = esl_ci_hashfunc_default(header_name, &hlen);
 
-               if ((!hp->hash || hash == hp->hash) && !strcasecmp(header_name, hp->name) && (esl_strlen_zero(val) || !strcmp(hp->value, val))) {
+               if ((!hp->hash || hash == hp->hash) && (hp->name && !strcasecmp(header_name, hp->name)) && (esl_strlen_zero(val) || !strcmp(hp->value, val))) {
                        if (lp) {
                                lp->next = hp->next;
                        } else {
@@ -625,6 +625,8 @@ ESL_DECLARE(esl_status_t) esl_event_serialize(esl_event_t *event, char **str, es
 
        dlen = blocksize * 2;
 
+       esl_assert(dlen == 0);
+
        if (!(buf = malloc(dlen))) {
                abort();
        }

diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index 642e39afeba149a0e74a70e326fc5621d2646029..4c5a3be931273d3368784e204ed2fefd72b0ec13 100644 (file)
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -152,7 +152,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_set_priority(switch_event_t *event,
   \return the value of the requested header
 */
 
-_Ret_opt_z_ SWITCH_DECLARE(switch_event_header_t *) switch_event_get_header_ptr(switch_event_t *event, const char *header_name);
+SWITCH_DECLARE(switch_event_header_t *) switch_event_get_header_ptr(switch_event_t *event, const char *header_name);
 _Ret_opt_z_ SWITCH_DECLARE(char *) switch_event_get_header_idx(switch_event_t *event, const char *header_name, int idx);
 #define switch_event_get_header(_e, _h) switch_event_get_header_idx(_e, _h, -1)