kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-07 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

fix leak and make static or dynamic head obj possible

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15972 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-12-15 19:26:58 +00:00
parent cfe0df58c6
commit 9d348910ef
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_types.h
View File

@ -1494,7 +1494,7 @@ typedef struct switch_console_callback_match_node switch_console_callback_match_
struct switch_console_callback_match { struct switch_console_callback_match {
struct switch_console_callback_match_node *head; struct switch_console_callback_match_node *head;
struct switch_console_callback_match_node *end; struct switch_console_callback_match_node *end;
switch_memory_pool_t *pool; int dynamic;
}; };
typedef struct switch_console_callback_match switch_console_callback_match_t; typedef struct switch_console_callback_match switch_console_callback_match_t;

5
src/switch_console.c
View File

@ -1125,6 +1125,10 @@ SWITCH_DECLARE(void) switch_console_free_matches(switch_console_callback_match_t
free(cur->val); free(cur->val);
free(cur); free(cur);
} }
if (my_match->dynamic) {
free(my_match);
}
} }
SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val) SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t **matches, const char *new_val)
@ -1133,6 +1137,7 @@ SWITCH_DECLARE(void) switch_console_push_match(switch_console_callback_match_t *
if (!*matches) { if (!*matches) {
switch_zmalloc(*matches, sizeof(**matches)); switch_zmalloc(*matches, sizeof(**matches));
(*matches)->dynamic = 1;
} }
switch_zmalloc(match, sizeof(*match)); switch_zmalloc(match, sizeof(*match));