From a5c4fc7c5c66f3eb7033dfe9bab13f372f420312 Mon Sep 17 00:00:00 2001 From: dvossel Date: Thu, 18 Jun 2009 16:44:37 +0000 Subject: 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.2@201679 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/xpmr/xpmr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/xpmr') diff --git a/channels/xpmr/xpmr.c b/channels/xpmr/xpmr.c index c2742cbc3..7c87410b2 100755 --- a/channels/xpmr/xpmr.c +++ b/channels/xpmr/xpmr.c @@ -157,7 +157,7 @@ i16 string_parse(char *src, char **dest, char ***ptrs) TRACEJ(2,(" source len = %i\n",slen)); pd=*dest; - if(pd) free(pd); + free(pd); pd=calloc(slen+1,1); memcpy(pd,src,slen); *dest=pd; -- cgit v1.2.3