summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2017-08-16 10:45:41 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2017-08-18 10:36:01 +0000
commit7c4c93a76ae80e2f4223a08e92145ce15645cfa6 (patch)
treecc8323f9a82e0f4fbf27e65a77e12e0e3cef5061 /src/network/access
parentb5d762ae87e8f3a35a84a6c7d6d324c27d487a8c (diff)
Avoid dereferencing nullptr
Change-Id: Id9558fa1db6a7a8f29149e26c761450f58b74b81 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 057821fa3f..4b8c03c5ac 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -691,7 +691,7 @@ void QNetworkAccessManager::setCookieJar(QNetworkCookieJar *cookieJar)
if (d->cookieJar && d->cookieJar->parent() == this)
delete d->cookieJar;
d->cookieJar = cookieJar;
- if (thread() == cookieJar->thread())
+ if (cookieJar && thread() == cookieJar->thread())
d->cookieJar->setParent(this);
}
}