mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

hdd_menu: improve error resilience in getFmtType()

Browse Source
This commit is contained in:
Stefan Seyfried
2014-03-01 21:16:29 +01:00
committed by svenhoefer
parent dbdf6b6afe
commit a25bc90d7b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/hdd_menu.cpp
View File

@@ -105,14 +105,18 @@ std::string getFmtType(const char* name, int num)
FILE* f = my_popen(pid, pcmd.c_str(), "r"); FILE* f = my_popen(pid, pcmd.c_str(), "r");
if (f != NULL) { if (f != NULL) {
char buff[512]; char buff[512];
fgets(buff, sizeof(buff), f); if (!fgets(buff, sizeof(buff), f))
buff[0] = '\0';
fclose(f); fclose(f);
ret = buff; ret = buff;
std::string search = "TYPE=\""; std::string search = "TYPE=\"";
size_t pos = ret.find(search); size_t pos = ret.find(search);
if (pos == std::string::npos)
return "";
ret = ret.substr(pos + search.length()); ret = ret.substr(pos + search.length());
pos = ret.find("\""); pos = ret.find("\"");
ret = ret.substr(0, pos); if (pos != std::string::npos)
ret = ret.substr(0, pos);
} }
return ret; return ret;
} }