From 7fb6fb30769ecbbf046aff9c8adabcd2c177a81f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 26 May 2011 10:04:15 -0500 Subject: [PATCH] doh merge conflict put back changes --- libs/esl/src/esl_event.c | 1 + src/switch_event.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libs/esl/src/esl_event.c b/libs/esl/src/esl_event.c index e1b2663995..d3c4b4c072 100644 --- 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 5bff7a9400..79881e69ae 100644 --- 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);