doh merge conflict put back changes

This commit is contained in:
Anthony Minessale 2011-05-26 10:04:15 -05:00
parent c080fb15d9
commit 7fb6fb3076
2 changed files with 3 additions and 0 deletions

View File

@ -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);

View File

@ -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);