fix(chatform, screenshotgrabber): Fixed memory leak

Memory for ScreenshotGrabber was allocated, but don't deallocated
qTox · Jun 30, 2016 · bf7c62d · bf7c62d
1 parent 2c49ada
commit bf7c62d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp
@@ -67,7 +67,8 @@
 
 ChatForm::ChatForm(Friend* chatFriend)
     : f(chatFriend)
-    , isTyping{false}
+    , screenshotGrabber(nullptr)
+    , isTyping(false)
 {
     Core* core = Core::getInstance();
     coreav = core->getAv();
@@ -208,7 +209,7 @@ void ChatForm::onAttachClicked()
             file.close();
             continue;
         }
-        long long filesize = file.size();
+        qint64 filesize = file.size();
         file.close();
         QFileInfo fi(path);
 
@@ -783,9 +784,14 @@ void ChatForm::onScreenshotClicked()
 
 void ChatForm::doScreenshot()
 {
-    ScreenshotGrabber* screenshotGrabber = new ScreenshotGrabber(this);
-    connect(screenshotGrabber, &ScreenshotGrabber::screenshotTaken, this, &ChatForm::onScreenshotTaken);
+    if (!screenshotGrabber)
+        screenshotGrabber = new ScreenshotGrabber(this);
+
+    connect(screenshotGrabber, &ScreenshotGrabber::screenshotTaken,
+            this, &ChatForm::onScreenshotTaken);
+
     screenshotGrabber->showGrabber();
+
     // Create dir for screenshots
     QDir(Settings::getInstance().getAppDataDirPath()).mkpath("screenshots");
 }
@@ -807,16 +813,21 @@ void ChatForm::onScreenshotTaken(const QPixmap &pixmap) {
         QMessageBox::warning(this,
                              tr("Failed to open temporary file", "Temporary file for screenshot"),
                              tr("qTox wasn't able to save the screenshot"));
+
+        delete screenshotGrabber;
+        screenshotGrabber = nullptr;
         return;
     }
 
     pixmap.save(&file, "PNG");
 
-    long long filesize = file.size();
+    qint64 filesize = file.size();
     file.close();
     QFileInfo fi(file);
 
     emit sendFile(f->getFriendID(), fi.fileName(), fi.filePath(), filesize);
+    delete screenshotGrabber;
+    screenshotGrabber = nullptr;
 }
 
 void ChatForm::onLoadHistory()

diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h
@@ -20,13 +20,15 @@
 #ifndef CHATFORM_H
 #define CHATFORM_H
 
-#include "genericchatform.h"
-#include "src/core/corestructs.h"
 #include <QSet>
 #include <QLabel>
 #include <QTimer>
 #include <QElapsedTimer>
 
+#include "genericchatform.h"
+#include "src/core/corestructs.h"
+#include "src/widget/tool/screenshotgrabber.h"
+
 class Friend;
 class FileTransferInstance;
 class QPixmap;
@@ -112,6 +114,7 @@ private slots:
     QAction* loadHistoryAction;
     QAction* copyStatusAction;
 
+    ScreenshotGrabber* screenshotGrabber;
     QHash<uint, FileTransferInstance*> ftransWidgets;
     void startCounter();
     void stopCounter();

diff --git a/src/widget/tool/screenshotgrabber.cpp b/src/widget/tool/screenshotgrabber.cpp
@@ -132,9 +132,10 @@ void ScreenshotGrabber::acceptRegion()
         return;
 
     qDebug() << "Screenshot accepted, chosen region" << rect;
-    emit screenshotTaken(this->screenGrab.copy(rect));
+    QPixmap pixmap = this->screenGrab.copy(rect);
     this->window->close();
     restoreHiddenWindows();
+    emit screenshotTaken(pixmap);
 }
 
 void ScreenshotGrabber::setupScene()