[svn-commits] trunk r33511 - in /trunk: ./ apps/app_alarmreceiver.c

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Jun 11 15:39:19 2006
New Revision: 33511

URL: http://svn.digium.com/view/asterisk?rev=33511&view=rev
Log:
Merged revisions 33510 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33510 | russell | 2006-06-11 16:38:39 -0400 (Sun, 11 Jun 2006) | 2 lines

fix two places that would cause a frame to be leaked

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_alarmreceiver.c

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

Modified: trunk/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_alarmreceiver.c?rev=33511&r1=33510&r2=33511&view=diff
==============================================================================
--- trunk/apps/app_alarmreceiver.c (original)
+++ trunk/apps/app_alarmreceiver.c Sun Jun 11 15:39:19 2006
@@ -206,6 +206,7 @@
 
 			i += wf.datalen / 8;
 			if (i > duration) {
+				ast_frfree(f);
 				break;
 			}
 			if (ast_write(chan, &wf)){
@@ -213,6 +214,7 @@
 					ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Failed to write frame on %s\n", chan->name);
 				ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
 				res = -1;
+				ast_frfree(f);
 				break;
 			}
 		}