summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-11-17 22:21:00 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-11-18 10:41:27 +0000
commitd542341492a0c18058b3f03008ea8916d84ccef3 (patch)
tree23b8e4aa8cca03f7799d3a27be719c7f8e9d3c41
parent7c3f338f042acebe7cf56de319bfb26a16d1aca3 (diff)
Fixed crash in FormDataIODevice
It happens that m_formElements can be null in some cases when FormDataIODevice::reset() is invoked. Change-Id: I92113588db57c9687bc20d331ba2f5ed8f9eec54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 4a2121907..cd89aa9ec 100644
--- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -70,7 +70,11 @@ bool FormDataIODevice::reset()
m_currentFile->close();
m_currentDelta = 0;
- m_formElements = m_formData->elements();
+
+ if (m_formData)
+ m_formElements = m_formData->elements();
+ else
+ m_formElements.clear();
prepareCurrentElement();
return true;