diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-17 21:22:10 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-17 21:22:10 +0000 |
| commit | 55394e09c2fe503f4460f47d9026fc3370edcb86 (patch) | |
| tree | a93a10971f948409fa8269d2909d873426fb7022 /res | |
| parent | f4fd2b3522ec04bb34c8365e6dfee0773af3e430 (diff) | |
Merged revisions 165318 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r165318 | mmichelson | 2008-12-17 15:17:20 -0600 (Wed, 17 Dec 2008) | 15 lines
Merged revisions 165255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r165255 | mmichelson | 2008-12-17 14:51:38 -0600 (Wed, 17 Dec 2008) | 7 lines
Fix some memory leaks found while looking at how realtime
configs are handled.
Also cleaned up some coding guidelines violations in app_realtime.c,
mostly related to spacing
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@165322 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_realtime.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_realtime.c b/res/res_realtime.c index 8b9ded0c9..407cffa92 100644 --- a/res/res_realtime.c +++ b/res/res_realtime.c @@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *cli_realtime_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { #define CRL_HEADER_FORMAT "%30s %-30s\n" - struct ast_variable *var=NULL; + struct ast_variable *var = NULL, *orig_var = NULL; switch (cmd) { case CLI_INIT: @@ -66,6 +66,7 @@ static char *cli_realtime_load(struct ast_cli_entry *e, int cmd, struct ast_cli_ if (var) { ast_cli(a->fd, CRL_HEADER_FORMAT, "Column Name", "Column Value"); ast_cli(a->fd, CRL_HEADER_FORMAT, "--------------------", "--------------------"); + orig_var = var; while (var) { ast_cli(a->fd, CRL_HEADER_FORMAT, var->name, var->value); var = var->next; @@ -73,6 +74,7 @@ static char *cli_realtime_load(struct ast_cli_entry *e, int cmd, struct ast_cli_ } else { ast_cli(a->fd, "No rows found matching search criteria.\n"); } + ast_variables_destroy(orig_var); return CLI_SUCCESS; } |