提交 c834ba6a authored 作者: Anthony Minessale's avatar Anthony Minessale

let's make sure realloc works

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3316 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 68bab16e
...@@ -615,8 +615,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch ...@@ -615,8 +615,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
llen = strlen(hp->name) + strlen(hp->value) + 2; llen = strlen(hp->name) + strlen(hp->value) + 2;
if ((len + llen) > dlen) { if ((len + llen) > dlen) {
char *m;
dlen += (blocksize + (len + llen)); dlen += (blocksize + (len + llen));
buf = realloc(buf, dlen); if ((m = realloc(buf, dlen))) {
buf = m;
} else {
switch_safe_free(buf);
return SWITCH_STATUS_MEMERR;
}
} }
snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, hp->value); snprintf(buf + len, dlen - len, "%s: %s\n", hp->name, hp->value);
...@@ -634,8 +640,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch ...@@ -634,8 +640,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
} }
if ((len + llen) > dlen) { if ((len + llen) > dlen) {
char *m;
dlen += (blocksize + (len + llen)); dlen += (blocksize + (len + llen));
buf = realloc(buf, dlen); if ((m = realloc(buf, dlen))) {
buf = m;
} else {
switch_safe_free(buf);
return SWITCH_STATUS_MEMERR;
}
} }
if (blen) { if (blen) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论