[asterisk-commits] russell: trunk r51058 - in /trunk: ./ main/config.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Jan 15 19:16:57 2007
New Revision: 51058

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

........
r51057 | russell | 2007-01-15 19:15:44 -0600 (Mon, 15 Jan 2007) | 3 lines

It is possible for the config pointer to be NULL here, so it needs to be
checked before dereferencing it.

........

Modified:
    trunk/   (props changed)
    trunk/main/config.c

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

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=51058&r1=51057&r2=51058
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Mon Jan 15 19:16:57 2007
@@ -945,7 +945,7 @@
 		}
 #endif
 
-	if (cfg->include_level == 1 && withcomments && comment_buffer) {
+	if (cfg && cfg->include_level == 1 && withcomments && comment_buffer) {
 		free(comment_buffer);
 		free(lline_buffer);
 		comment_buffer = NULL;