[asterisk-commits] tilghman: trunk r89546 - in /trunk: ./ res/res_adsi.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sat Nov 24 11:07:12 2007
New Revision: 89546

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89546
Log:
Merged revisions 89545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89545 | tilghman | 2007-11-24 10:59:59 -0600 (Sat, 24 Nov 2007) | 5 lines

Free some frames that would otherwise leak on error.
Reported by: Laureano
Patch by: Laureano,tilghman
(Closes issue #11351)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_adsi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_adsi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_adsi.c?view=diff&rev=89546&r1=89545&r2=89546
==============================================================================
--- trunk/res/res_adsi.c (original)
+++ trunk/res/res_adsi.c Sat Nov 24 11:07:12 2007
@@ -179,6 +179,7 @@
 		outf.samples = amt;
 		if (ast_write(chan, &outf)) {
 			ast_log(LOG_WARNING, "Failed to carefully write frame\n");
+			ast_frfree(inf);
 			return -1;
 		}
 		/* Update pointers and lengths */
@@ -242,6 +243,7 @@
 						if (!chan->adsicpe)
 							chan->adsicpe = AST_ADSI_UNAVAILABLE;
 						errno =	ENOSYS;
+						ast_frfree(f);
 						return -1;
 					}
 				}