mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(trunk, qt) #5192 'Free Memory Read error in transmission-qt's Prefs destructor' -- fixed.

This commit is contained in:
Jordan Lee 2012-12-24 19:53:33 +00:00
parent 3976366306
commit e19fd611c7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt/prefs.cc
View File

@ -224,9 +224,11 @@ Prefs :: ~Prefs ()
case TrTypes::FilterModeType:
tr_variantDictAddStr (&current_settings, key, val.value<FilterMode>().name().toUtf8().constData());
break;
case QVariant::String:
{
const char * s = val.toByteArray().constData();
const QByteArray ba (val.toByteArray());
const char * s = ba.constData();
if (Utils::isValidUtf8 (s))
tr_variantDictAddStr (&current_settings, key, s);
else
@ -323,7 +325,7 @@ QString
Prefs :: getString (int key) const
{
assert (myItems[key].type == QVariant::String);
QByteArray b = myValues[key].toByteArray();
const QByteArray b = myValues[key].toByteArray();
if (Utils::isValidUtf8 (b.constData()))
myValues[key].setValue (QString::fromUtf8 (b.constData()));
return myValues[key].toString();