From 53919ce9de491ebd2896eac4bc271886fbe3d7b2 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 22 Apr 2018 15:30:16 +0200 Subject: [PATCH] CookieJar: Clear filter function in destructor Fixes possible crash when cookieFilter is called after CookieJar was destroyed. --- src/lib/cookies/cookiejar.cpp | 7 +++++++ src/lib/cookies/cookiejar.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/lib/cookies/cookiejar.cpp b/src/lib/cookies/cookiejar.cpp index cb691c8e8..ac87aa94e 100644 --- a/src/lib/cookies/cookiejar.cpp +++ b/src/lib/cookies/cookiejar.cpp @@ -44,6 +44,13 @@ CookieJar::CookieJar(QObject* parent) connect(m_client, &QWebEngineCookieStore::cookieRemoved, this, &CookieJar::slotCookieRemoved); } +CookieJar::~CookieJar() +{ +#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) + m_client->setCookieFilter(nullptr); +#endif +} + void CookieJar::loadSettings() { Settings settings; diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h index 1838d0825..bbb041501 100644 --- a/src/lib/cookies/cookiejar.h +++ b/src/lib/cookies/cookiejar.h @@ -32,6 +32,7 @@ class FALKON_EXPORT CookieJar : public QObject public: explicit CookieJar(QObject* parent = 0); + ~CookieJar(); void loadSettings();