From 804a6894c53416aef9e2cce02cb5deec3ec67bfa Mon Sep 17 00:00:00 2001 From: yexo Date: Thu, 11 Feb 2010 15:12:08 +0000 Subject: (svn r19096) -Fix: segfault when one of the items in the news_display group in the config file has no value --- src/settings.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/settings.cpp b/src/settings.cpp index 42776fc0f..9c9dd1f37 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1133,14 +1133,17 @@ static void NewsDisplayLoadConfig(IniFile *ini, const char *grpname) continue; } - if (strcasecmp(item->value, "full") == 0) { + if (StrEmpty(item->value)) { + DEBUG(misc, 0, "Empty display value for newstype %s", item->name); + continue; + } else if (strcasecmp(item->value, "full") == 0) { _news_type_data[news_item].display = ND_FULL; } else if (strcasecmp(item->value, "off") == 0) { _news_type_data[news_item].display = ND_OFF; } else if (strcasecmp(item->value, "summarized") == 0) { _news_type_data[news_item].display = ND_SUMMARY; } else { - DEBUG(misc, 0, "Invalid display value: %s", item->value); + DEBUG(misc, 0, "Invalid display value for newstype %s: %s", item->name, item->value); continue; } } -- cgit v1.2.3-70-g09d2