[svn-commits] tilghman: branch 1.6.0 r165659 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Dec 18 12:46:23 2008
New Revision: 165659

URL: http://svn.digium.com/view/asterisk?view=rev&rev=165659
Log:
Merged revisions 165658 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r165658 | tilghman | 2008-12-18 12:36:48 -0600 (Thu, 18 Dec 2008) | 2 lines
  
  Fix 2 resource leaks and fix another pipe-to-comma conversion
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=165659&r1=165658&r2=165659
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Thu Dec 18 12:46:23 2008
@@ -5448,7 +5448,6 @@
 				int old_priority;
 				struct ast_app* app;
 
-				
 				app = pbx_findapp("Directory");
 				if (app) {
 					char vmcontext[256];
@@ -5494,6 +5493,9 @@
 					AST_LIST_INSERT_HEAD(&extensions, receiver, list);
 					found++;
 				} else {
+					while ((receiver = AST_LIST_REMOVE_HEAD(&extensions, list))) {
+						free_user(receiver);
+					}
 					valid_extensions = 0;
 					break;
 				}
@@ -5508,10 +5510,9 @@
 						return res;
 					}
 				} else {
-					/* Dispose just in case */
-					DISPOSE(fn, -1);
 					res = ast_say_digit_str(chan, s, ecodes, chan->language);
 				}
+				DISPOSE(fn, -1);
 
 				s = strsep(&stringp, "*");
 			}