diff options
| author |  stakewinner00 | 2015-11-02 08:49:23 +0100 |
|---|---|---|
| committer | stakewinner00 | 2015-11-02 08:49:23 +0100 |
| commit | d7137f0584e366a46c0f5ef168618123540fda92 (patch) | |
| tree | 2d01e65084ed79209663217f563a44de61bee1e0 /src/modules/objects/KvsObject_pixmap.cpp | |
| parent | Use ++i for iterators (diff) | |
| download | KVIrc-d7137f0584e366a46c0f5ef168618123540fda92.tar.gz KVIrc-d7137f0584e366a46c0f5ef168618123540fda92.tar.bz2 KVIrc-d7137f0584e366a46c0f5ef168618123540fda92.zip | |
Fix invalid use of a pointer already freed
Diffstat (limited to 'src/modules/objects/KvsObject_pixmap.cpp')
| -rw-r--r-- | src/modules/objects/KvsObject_pixmap.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index f6846112a..23e1527ab 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -287,8 +287,8 @@ KVSO_CLASS_FUNCTION(pixmap,setPixel) c->error(__tr2qs_ctx("The pixmap is null","objects")); return false; } else if(m_currentType==Pixmap) { - if(m_pImage) - delete m_pImage; + delete m_pImage; + m_pImage = new QImage(); *m_pImage = m_pPixmap->toImage(); delete m_pPixmap; } @@ -317,9 +317,8 @@ KVSO_CLASS_FUNCTION(pixmap,pixel) } else if(m_currentType==Pixmap) { // qDebug("mpimage %i",m_pImage); // qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height()); - if(m_pImage) - delete m_pImage; - else m_pImage = new QImage(); + delete m_pImage; + m_pImage = new QImage(); *m_pImage = m_pPixmap->toImage(); delete m_pPixmap; m_pPixmap = 0; |