mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
cc_frm_footer.cpp: avoid possible crash if content[i].button = NULL
If content[i].button = NULL, conversion of content[i].button into std::string would fail.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20ab649f45
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-08-19 (Sun, 19 Aug 2018)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -204,7 +204,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_cc * const con
|
|||||||
* init button label face values
|
* init button label face values
|
||||||
*/
|
*/
|
||||||
string txt = content[i].locale == NONEXISTANT_LOCALE ? content[i].text : g_Locale->getText(content[i].locale);
|
string txt = content[i].locale == NONEXISTANT_LOCALE ? content[i].text : g_Locale->getText(content[i].locale);
|
||||||
string icon_name = string(content[i].button);
|
string icon_name = content[i].button ? string(content[i].button) : "";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ignore item, if no text and no icon is defined.
|
* Ignore item, if no text and no icon is defined.
|
||||||
|
Reference in New Issue
Block a user