mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

add CRCInput::getKeyNameC to fix lifetime issues

Browse Source 
in menu.cpp, getKeyName().c_str()'s destructor was already invoked
when the value was used, triggering a valgrind warning.
This commit is contained in:
Stefan Seyfried
2012-10-31 22:52:12 +01:00
parent 047223440b
commit d5d136f6c1
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/driver/rcinput.cpp
View File

@@ -1567,16 +1567,21 @@ const char * CRCInput::getSpecialKeyName(const unsigned int key)
}
std::string CRCInput::getKeyName(const unsigned int key)
{
return (std::string)getKeyNameC(key);
}
const char *CRCInput::getKeyNameC(const unsigned int key)
{
int lunicode_value = getUnicodeValue(key);
if (lunicode_value == -1)
return getSpecialKeyName(key);
else
{
char tmp[2];
static char tmp[2];
tmp[0] = lunicode_value;
tmp[1] = 0;
return std::string(tmp);
return tmp;
}
}

1
src/driver/rcinput.h
View File

@@ -282,6 +282,7 @@ class CRCInput
static int getUnicodeValue(const neutrino_msg_t key);
static const char * getSpecialKeyName(const unsigned int key);
static const char *getKeyNameC(const unsigned int key);
static std::string getKeyName(const unsigned int key);
int addTimer(uint64_t Interval, bool oneshot= true, bool correct_time= true );

2
src/gui/widget/menue.cpp
View File

@@ -858,7 +858,7 @@ void CMenuWidget::calcSize()
{
const char *tmp;
if (items[i]->iconName.empty())
tmp = CRCInput::getKeyName(items[i]->directKey).c_str();
tmp = CRCInput::getKeyNameC(items[i]->directKey);
else
tmp = items[i]->iconName.c_str();
int w, h;