kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-05 02:02:01 +00:00
Code Issues Projects Releases Wiki Activity

a little realloc never hurt anyone.

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4756 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-03-23 22:44:28 +00:00
parent 67acaefcec
commit 550db707af
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/switch_apr.c
View File

@ -657,8 +657,31 @@ SWITCH_DECLARE(int) switch_vasprintf(char **buf, const char *format, va_list ap)
#ifdef HAVE_VASPRINTF #ifdef HAVE_VASPRINTF
return vasprintf(buf, format, ap); return vasprintf(buf, format, ap);
#else #else
*buf = (char *) malloc(2048); size_t block_size = 1024;
return vsnprintf(*buf, 2048, format, ap); int ret = -1;
int count = 1;
*buf = (char *) malloc(block_size);
if (*buf == NULL) {
return -1;
}
while (ret == -1 && count < 10) {
ret = vsnprintf(*buf, block_size*count, format, ap);
if (ret == -1) {
void *new_buf;
count++;
new_buf = realloc(*buf, block_size*count);
if (new_buf == NULL) {
*buf = NULL;
return -1;
} else {
*buf = new_buf;
}
}
}
return ret;
#endif #endif
} }

2
src/switch_console.c
View File

@ -41,7 +41,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle
char *buf = handle->data; char *buf = handle->data;
char *end = handle->end; char *end = handle->end;
int ret = 0; int ret = 0;
char *data; char *data = NULL;
if (handle->data_len >= handle->data_size) { if (handle->data_len >= handle->data_size) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;