diff options
Diffstat (limited to 'Source/WebCore')
-rw-r--r-- | Source/WebCore/history/qt/HistoryItemQt.cpp | 11 | ||||
-rw-r--r-- | Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/Source/WebCore/history/qt/HistoryItemQt.cpp b/Source/WebCore/history/qt/HistoryItemQt.cpp index 5a54516f3..89777eb72 100644 --- a/Source/WebCore/history/qt/HistoryItemQt.cpp +++ b/Source/WebCore/history/qt/HistoryItemQt.cpp @@ -81,8 +81,7 @@ QDataStreamCoder::QDataStreamCoder(QDataStream& stream) void QDataStreamCoder::encodeBytes(const uint8_t* bytes, size_t size) { m_stream << qint64(size); - for (; size > 0; --size) - m_stream << bytes++; + m_stream.writeRawData(reinterpret_cast<const char *>(bytes++), size); } void QDataStreamCoder::encodeBool(bool value) @@ -129,13 +128,9 @@ bool QDataStreamCoder::decodeBytes(Vector<uint8_t>& out) { out.clear(); qint64 count; - uint8_t byte; m_stream >> count; - out.reserveCapacity(count); - for (qint64 i = 0; i < count; ++i) { - m_stream >> byte; - out.append(byte); - } + out.resize(count); + m_stream.readRawData(reinterpret_cast<char *>(out.data()), count); return m_stream.status() == QDataStream::Ok; } 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; |