[asterisk-commits] twilson: branch 1.6.1 r168157 - in /branches/1.6.1: ./ res/res_phoneprov.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Jan  9 14:30:21 2009
New Revision: 168157

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

........
  r168142 | twilson | 2009-01-09 14:25:25 -0600 (Fri, 09 Jan 2009) | 7 lines
  
  Don't leak memory if phoneprov.conf does not exist
  
  (closes issue #14203)
  Reported by: jamesgolovich
  Patches: 
        asterisk-phoneprovleak.diff.txt uploaded by jamesgolovich (license 176)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_phoneprov.c

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

Modified: branches/1.6.1/res/res_phoneprov.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_phoneprov.c?view=diff&rev=168157&r1=168156&r2=168157
==============================================================================
--- branches/1.6.1/res/res_phoneprov.c (original)
+++ branches/1.6.1/res/res_phoneprov.c Fri Jan  9 14:30:21 2009
@@ -943,6 +943,7 @@
 
 	if (!(phoneprov_cfg = ast_config_load("phoneprov.conf", config_flags))) {
 		ast_log(LOG_ERROR, "Unable to load config phoneprov.conf\n");
+		ast_config_destroy(cfg);
 		return -1;
 	}