summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-02-02 15:05:01 +0000
committerKristian Monsen <kristianm@google.com>2011-02-02 15:05:01 +0000
commit01ba55459e3ec9e9c21a35a6a50f37908ce4d42b (patch)
treeb9ae0ad7bd6726dcefaa506003951c6c27bd5fe7 /WebKit
parent4da96b9950ba2e86203aa50be39adcc8431a95a4 (diff)
downloadexternal_webkit-01ba55459e3ec9e9c21a35a6a50f37908ce4d42b.zip
external_webkit-01ba55459e3ec9e9c21a35a6a50f37908ce4d42b.tar.gz
external_webkit-01ba55459e3ec9e9c21a35a6a50f37908ce4d42b.tar.bz2
Fix for bug 3413829, crash when loading page
When a read failed we deleted it and scheduled a new read. The new read would also fail (since the request was deleted), and crash. Change-Id: Idcb3265e705d616657c2679389951d632c54cca5
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/WebRequest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/WebRequest.cpp b/WebKit/android/WebCoreSupport/WebRequest.cpp
index 9d7a88e..fd6bbe2 100644
--- a/WebKit/android/WebCoreSupport/WebRequest.cpp
+++ b/WebKit/android/WebCoreSupport/WebRequest.cpp
@@ -451,7 +451,7 @@ void WebRequest::startReading()
if (!read(&bytesRead)) {
if (m_request && m_request->status().is_io_pending())
return; // Wait for OnReadCompleted()
- finish(false);
+ return finish(false);
}
// bytesRead == 0 indicates finished