Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

display: fix possible crash if song_columns_list_format was invalid

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-09 14:23:20 +02:00
parent 869d772b85
commit 6f81748602
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/display.cpp
View File

@@ -274,10 +274,9 @@ void showSongsInColumns(NC::Menu<T> &menu, const MPD::Song &s, HasSongs &screen)
std::string Display::Columns(size_t list_width) std::string Display::Columns(size_t list_width)
{ {
if (Config.columns.empty())
return "";
std::string result; std::string result;
if (Config.columns.empty())
return result;
int width; int width;
int remained_width = list_width; int remained_width = list_width;
@@ -305,12 +304,16 @@ std::string Display::Columns(size_t list_width)
std::wstring name; std::wstring name;
if (it->name.empty()) if (it->name.empty())
{ {
for (size_t j = 0; j < it->type.length(); ++j) size_t j = 0;
while (true)
{ {
name += toColumnName(it->type[j]); name += toColumnName(it->type[j]);
name += '/'; ++j;
if (j < it->type.length())
name += '/';
else
break;
} }
name.resize(name.length()-1);
} }
else else
name = it->name; name = it->name;