summaryrefslogtreecommitdiff
path: root/Source/WebCore/platform
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-25 08:53:46 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-25 08:54:41 +0100
commitbb9f65f54ee866eced8e157b59e64d05a52aa3a5 (patch)
tree07898105fe79caed5fa3bbdbb9d6752ee6928c0f /Source/WebCore/platform
parentb9ce7cfc7f14b96b0b573f56f792fb3a55ac60f9 (diff)
parented84b8b4ff88c5affaa89edb72e6aaf481f3ccc1 (diff)
downloadqtwebkit-5.7.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Change-Id: I8ffa0181ef59a4fcec216f15413171cbc5b1daed
Diffstat (limited to 'Source/WebCore/platform')
-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;