mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-03 02:41:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/user_menue.cpp fix AddressSanitizer: heap-use-after-free

Browse Source
This commit is contained in:
Jacek Jendrzej
2016-03-06 13:15:36 +01:00
parent 094d224f7f
commit 4947a71782
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/user_menue.cpp
View File

@@ -533,7 +533,7 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) { if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
if(loc == NONEXISTANT_LOCALE && !text) { if(loc == NONEXISTANT_LOCALE && !text) {
CWebTVResolution webtvres; CWebTVResolution webtvres;
text = webtvres.getResolutionValue(); std::string tmp = webtvres.getResolutionValue();
if (!(videoDecoder->getBlank())) if (!(videoDecoder->getBlank()))
{ {
int xres = 0, yres = 0, framerate; int xres = 0, yres = 0, framerate;
@@ -541,12 +541,14 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
if (xres && yres) if (xres && yres)
{ {
std::string res = to_string(xres) + "x" + to_string(yres); std::string res = to_string(xres) + "x" + to_string(yres);
if (res.compare(text)) if (res.compare(tmp))
{ {
std::string tmp = (string)text + " (" + res + ")"; tmp = " (" + res + ")";
text = tmp.c_str(); text = tmp.c_str();
} }
} }
}else{
text = tmp.c_str();
} }
} else } else
return_title = true; return_title = true;