doh merge conflict put back changes

diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c
index e1b266399532f99813ead09f5d0af792b8eaa4e4..d3c4b4c072227f5c09b1a8f326fa29412aa60bee 100644 (file)
--- a/libs/esl/src/esl_event.c
+++ b/libs/esl/src/esl_event.c
@@ -391,6 +391,7 @@ ESL_DECLARE(int) esl_event_add_array(esl_event_t *event, const char *var, const
        data = strdup(val + 7);
        
        len = (sizeof(char *) * max) + 1;
+       esl_assert(len);
        array = malloc(len);
        memset(array, 0, len);
        

diff --git a/src/switch_event.c b/src/switch_event.c
index 5bff7a940041aa09be4688e7374842511d5cc6e0..79881e69aec80734d8ca7a15750e946aa28d36f1 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -882,6 +882,8 @@ SWITCH_DECLARE(int) switch_event_add_array(switch_event_t *event, const char *va
        data = strdup(val + 7);
        
        len = (sizeof(char *) * max) + 1;
+       switch_assert(len);
+
        array = malloc(len);
        memset(array, 0, len);