summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-04-08 13:52:34 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2016-04-13 08:51:40 +0000
commitd1168fda00c6eaff0f367d969639eec9adadb907 (patch)
tree2ab3de2de3848a1de5b9b3638821f4af6702e54a /src
parentbae703a3f53126a8baac5ef957662e62ce00344a (diff)
Fix crash while settingPersistentStoragePath
Get rid of dangling pointer on storage removal in URLRequestContextGetterQt. This is accessed later in generateHttpCache. Task-number: QTBUG-52468 Change-Id: I03c0b3186b01046e17258af838bf5f9adc435da0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/url_request_context_getter_qt.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/url_request_context_getter_qt.cpp b/src/core/url_request_context_getter_qt.cpp
index 20efec295..07833a9f8 100644
--- a/src/core/url_request_context_getter_qt.cpp
+++ b/src/core/url_request_context_getter_qt.cpp
@@ -153,8 +153,11 @@ void URLRequestContextGetterQt::generateStorage()
Q_ASSERT(m_urlRequestContext);
// We must stop all requests before deleting their backends.
- if (m_storage)
+ if (m_storage) {
cancelAllUrlRequests();
+ // we need to get rid of dangling pointer due to coming storage deletion
+ m_urlRequestContext->set_http_transaction_factory(0);
+ }
m_storage.reset(new net::URLRequestContextStorage(m_urlRequestContext.get()));