Merged revisions 201678 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  fixes some memory leaks and redundant conditions
  
  (closes issue #15269)
  Reported by: contactmayankjain
  Patches:
        patch.txt uploaded by contactmayankjain (license 740)
        memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
  Tested by: contactmayankjain, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-18 16:51:54 +00:00
parent c6c5ca6454
commit 09b65fe917
15 changed files with 43 additions and 62 deletions

View File

@@ -451,8 +451,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
ast_unlock_contexts();
error2:
if (exten)
free(exten);
free(exten);
} else if (a->pos == 4) { /* 'dialplan remove extension EXT _X_' (priority) */
char *exten = NULL, *context, *cid, *p;
struct ast_context *c;
@@ -509,8 +508,7 @@ static char *complete_dialplan_remove_extension(struct ast_cli_args *a)
}
ast_unlock_contexts();
error3:
if (exten)
free(exten);
free(exten);
}
return ret;
}
@@ -1139,8 +1137,7 @@ static char *complete_dialplan_add_ignorepat(struct ast_cli_args *a)
ret = strdup(ast_get_context_name(c));
}
if (ignorepat)
free(ignorepat);
free(ignorepat);
ast_unlock_contexts();
return ret;
}