mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-17 01:02:12 +00:00
doh merge conflict put back changes
This commit is contained in:
parent
c080fb15d9
commit
7fb6fb3076
@ -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
|
|||||||
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);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user