aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-16 01:16:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-01-16 01:16:57 +0000
commitb6714c8699998e1f2974d91b7a1879933d0d14be (patch)
treed9e222719814a041364c034f8be225040da84d6c
parent0bb5fbb3a6fa437e3b444a43f3e76acd5c37fd2f (diff)
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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@51058 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/config.c b/main/config.c
index 2acfde86f..4a986bd03 100644
--- a/main/config.c
+++ b/main/config.c
@@ -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;