mirror of
https://github.com/transmission/transmission
synced 2025-02-20 21:26:53 +00:00
(trunk, qt) #5192 'Free Memory Read error in transmission-qt's Prefs destructor' -- fixed.
This commit is contained in:
parent
3976366306
commit
e19fd611c7
1 changed files with 4 additions and 2 deletions
|
@ -224,9 +224,11 @@ Prefs :: ~Prefs ()
|
|||
case TrTypes::FilterModeType:
|
||||
tr_variantDictAddStr (¤t_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 (¤t_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();
|
||||
|
|
Loading…
Reference in a new issue