aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar IceN9ne2016-11-06 15:46:56 -0500
committerGravatar IceN9ne2016-11-06 15:46:56 -0500
commitfdf491ac08dc8ce99244a81a159673a6d1edb3eb (patch)
tree4fa5b4fe007316ea94825a2459bafd4b58dfbea2
parentKvsObject_pixmap: Fix potential memory leak in class function pixel (diff)
downloadKVIrc-fdf491ac08dc8ce99244a81a159673a6d1edb3eb.tar.gz
KVIrc-fdf491ac08dc8ce99244a81a159673a6d1edb3eb.tar.bz2
KVIrc-fdf491ac08dc8ce99244a81a159673a6d1edb3eb.zip
KvsObject_painter: Fix potential memory leak in class function pen
-rw-r--r--src/modules/objects/KvsObject_painter.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 603181430..2c447d368 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -1011,23 +1011,21 @@ KVSO_CLASS_FUNCTION(painter, pen)
return true;
}
QColor col = m_pPainter->pen().color();
- KviKvsVariant * pRed = new KviKvsVariant((kvs_int_t)col.red());
- KviKvsVariant * pGreen = new KviKvsVariant((kvs_int_t)col.green());
- KviKvsVariant * pBlue = new KviKvsVariant((kvs_int_t)col.blue());
if(szFlags.indexOf('a', 0, Qt::CaseInsensitive) != -1)
{
KviKvsArray * pArray = new KviKvsArray();
- pArray->set(0, pRed);
- pArray->set(1, pGreen);
- pArray->set(2, pBlue);
+ pArray->set(0, new KviKvsVariant((kvs_int_t)col.red()));
+ pArray->set(1, new KviKvsVariant((kvs_int_t)col.green()));
+ pArray->set(2, new KviKvsVariant((kvs_int_t)col.blue()));
c->returnValue()->setArray(pArray);
}
else if(szFlags.indexOf('h', 0, Qt::CaseInsensitive) != -1)
{
KviKvsHash * pHash = new KviKvsHash();
- pHash->set("red", pRed);
- pHash->set("green", pGreen);
- pHash->set("blue", pBlue);
+ pHash->set("red", new KviKvsVariant((kvs_int_t)col.red()));
+ pHash->set("green", new KviKvsVariant((kvs_int_t)col.green()));
+ pHash->set("blue", new KviKvsVariant((kvs_int_t)col.blue()));
+ c->returnValue()->setHash(pHash);
}
return true;
}