提交 7fb6fb30 authored 作者: Anthony Minessale's avatar Anthony Minessale

doh merge conflict put back changes

上级 c080fb15
...@@ -391,6 +391,7 @@ ESL_DECLARE(int) esl_event_add_array(esl_event_t *event, const char *var, const ...@@ -391,6 +391,7 @@ ESL_DECLARE(int) esl_event_add_array(esl_event_t *event, const char *var, const
data = strdup(val + 7); data = strdup(val + 7);
len = (sizeof(char *) * max) + 1; len = (sizeof(char *) * max) + 1;
esl_assert(len);
array = malloc(len); array = malloc(len);
memset(array, 0, len); memset(array, 0, len);
......
...@@ -882,6 +882,8 @@ SWITCH_DECLARE(int) switch_event_add_array(switch_event_t *event, const char *va ...@@ -882,6 +882,8 @@ SWITCH_DECLARE(int) switch_event_add_array(switch_event_t *event, const char *va
data = strdup(val + 7); data = strdup(val + 7);
len = (sizeof(char *) * max) + 1; len = (sizeof(char *) * max) + 1;
switch_assert(len);
array = malloc(len); array = malloc(len);
memset(array, 0, len); memset(array, 0, len);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论