aboutsummaryrefslogtreecommitdiffstats
path: root/res/ael
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:58:03 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:58:03 +0000
commit0740578e6df8e4cb4cb49a2550f5946ceaf0e509 (patch)
tree2bbf3d469c8e0fd61393b6e8d9c2abcfac0107ce /res/ael
parentc6e74d7f36371d508de5ec7ebcd838913c75ce1c (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@201682 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/ael')
-rw-r--r--res/ael/ael_lex.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/res/ael/ael_lex.c b/res/ael/ael_lex.c
index 0271a4a53..b3fa11b26 100644
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@@ -3221,8 +3221,7 @@ static void pbcpush(char x)
void ael_yyfree(void *ptr, yyscan_t yyscanner)
{
- if (ptr)
- free( (char*) ptr );
+ free( (char*) ptr );
}
static int pbcpop(char x)
@@ -3361,8 +3360,7 @@ struct pval *ael2_parse(char *filename, int *errors)
*errors = 1;
return 0;
}
- if (my_file)
- free(my_file);
+ free(my_file);
my_file = strdup(filename);
stat(filename, &stats);
buffer = (char*)malloc(stats.st_size+2);