File 0008-Fix-potential-crash-when-aborting-a-ListJo... of Package ark

Overview Repositories Revisions Requests Users Attributes Meta

File 0008-Fix-potential-crash-when-aborting-a-ListJob.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Currently displaying revision ad2d69f4140343ee747a64729f7331a0 , Show latest

From c866108ceecdffa6e0263294153cad00eb297d69 Mon Sep 17 00:00:00 2001
From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Tue, 27 Sep 2016 11:33:27 +0200
Subject: [PATCH 08/13] Fix potential crash when aborting a ListJob

Libarchive's error() signal is connected to the `Job::onError` slot, but
when we abort a ListJob, the slot might be called when the job instance
has already been deleted. So we now emit this signal only when we are not
aborting the job.

BUG: 369283
FIXED-IN: 16.08.2

Differential Revision: D2852
---
 plugins/libarchive/libarchiveplugin.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp
index 934e5a2..db31e12 100644
--- a/plugins/libarchive/libarchiveplugin.cpp
+++ b/plugins/libarchive/libarchiveplugin.cpp
@@ -104,12 +104,13 @@ bool LibarchivePlugin::list()
         m_cachedArchiveEntryCount++;
         archive_read_data_skip(arch_reader.data());
     }
-    m_abortOperation = false;
 
     if (result != ARCHIVE_EOF) {
-        const QString errorString = QLatin1String(archive_error_string(arch_reader.data()));
-        // FIXME: what about the other archive_error_string() calls? Do they also happen to return empty strings?
-        emit error(errorString.isEmpty() ? i18nc("@info", "Could not read until the end of the archive") : errorString);
+        if (!m_abortOperation) {
+            const QString errorString = QLatin1String(archive_error_string(arch_reader.data()));
+            // FIXME: what about the other archive_error_string() calls? Do they also happen to return empty strings?
+            emit error(errorString.isEmpty() ? i18nc("@info", "Could not read until the end of the archive") : errorString);
+        }
         return false;
     }
 
-- 
2.10.0

Places

File 0008-Fix-potential-crash-when-aborting-a-ListJob.patch of Package ark (Revision ad2d69f4140343ee747a64729f7331a0)

Places