Merged revisions 51057 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 16 Jan 2007 01:16:57 +0000 (01:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 16 Jan 2007 01:16:57 +0000 (01:16 +0000)
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.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51058 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/config.c

index 2acfde8..4a986bd 100644 (file)
@@ -945,7 +945,7 @@ static struct ast_config *config_text_file_load(const char *database, const char
                }
 #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;