kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 01:26:58 +00:00
Code Issues Projects Releases Wiki Activity

improve gateway stuff and minor tweak to event serialize

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3570 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-12-07 22:56:17 +00:00
parent e1dca08b03
commit 6d50b0c7b5
3 changed files with 123 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/switch_event.c
View File

@@ -600,7 +600,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
{
switch_size_t len = 0;
switch_event_header_t *hp;
switch_size_t llen = 0, dlen = 0, blocksize = 512, encode_len = 1024;
switch_size_t llen = 0, dlen = 0, blocksize = 512, encode_len = 1024, new_len = 0;
char *buf;
char *encode_buf = NULL; /* used for url encoding of variables to make sure unsafe things stay out of the serialzed copy */
@@ -626,19 +626,24 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
* the memory, allocate and only reallocate if we need more. This avoids an alloc, free CPU
* destroying loop.
*/
if(encode_len < ((strlen(hp->value) * 3) + 1)) {
new_len = (strlen(hp->value) * 3) + 1;
if(encode_len < new_len) {
char* tmp;
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len);
/* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */
if(!(tmp = realloc(encode_buf, ((strlen(hp->value) * 3) + 1)))) {
/* oh boy, ram's gone, give back what little we grabbed and bail */
switch_safe_free(buf);
return SWITCH_STATUS_MEMERR;
}
/* keep track of the size of our allocation */
encode_len = (strlen(hp->value) * 3) + 1;
encode_len = new_len;
if(!(tmp = realloc(encode_buf, encode_len))) {
/* oh boy, ram's gone, give back what little we grabbed and bail */
switch_safe_free(buf);
switch_safe_free(encode_buf);
return SWITCH_STATUS_MEMERR;
}
encode_buf = tmp;
}