aboutsummaryrefslogtreecommitdiffstats
path: root/channels/xpmr/xpmr.c
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:51:54 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:51:54 +0000
commitf789484094473a3914d3cd4d99ea8950e32c15ef (patch)
tree1f8b8565fdaccde4115c617c6c1381ab56ad4dca /channels/xpmr/xpmr.c
parent0816d31618f6656fcdd348220f863a1635716bc4 (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.1@201680 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/xpmr/xpmr.c')
-rwxr-xr-xchannels/xpmr/xpmr.c2
1 files changed, 1 insertions, 1 deletions
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;