Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/browser/renderer_host/async_resource_handler.cc

Issue 21222: Fix a browser crash when the async resource handler keeps an... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/shared_memory.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/renderer_host/async_resource_handler.h" 5 #include "chrome/browser/renderer_host/async_resource_handler.h"
6 6
7 #include "base/process.h" 7 #include "base/process.h"
8 #include "base/shared_memory.h" 8 #include "base/shared_memory.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "net/base/io_buffer.h" 10 #include "net/base/io_buffer.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 return true; 96 return true;
97 } 97 }
98 98
99 base::SharedMemoryHandle handle; 99 base::SharedMemoryHandle handle;
100 if (!read_buffer_->shared_memory()->GiveToProcess(render_process_, &handle)) { 100 if (!read_buffer_->shared_memory()->GiveToProcess(render_process_, &handle)) {
101 // We wrongfully incremented the pending data count. Fake an ACK message 101 // We wrongfully incremented the pending data count. Fake an ACK message
102 // to fix this. We can't move this call above the WillSendData because 102 // to fix this. We can't move this call above the WillSendData because
103 // it's killing our read_buffer_, and we don't want that when we pause 103 // it's killing our read_buffer_, and we don't want that when we pause
104 // the request. 104 // the request.
105 rdh_->OnDataReceivedACK(render_process_host_id_, request_id); 105 rdh_->OnDataReceivedACK(render_process_host_id_, request_id);
106 // We just unmapped the memory.
107 read_buffer_ = NULL;
106 return false; 108 return false;
107 } 109 }
108 // We just unmapped the memory. 110 // We just unmapped the memory.
109 read_buffer_ = NULL; 111 read_buffer_ = NULL;
110 112
111 receiver_->Send(new ViewMsg_Resource_DataReceived( 113 receiver_->Send(new ViewMsg_Resource_DataReceived(
112 routing_id_, request_id, handle, *bytes_read)); 114 routing_id_, request_id, handle, *bytes_read));
113 115
114 return true; 116 return true;
115 } 117 }
116 118
117 bool AsyncResourceHandler::OnResponseCompleted(int request_id, 119 bool AsyncResourceHandler::OnResponseCompleted(int request_id,
118 const URLRequestStatus& status) { 120 const URLRequestStatus& status) {
119 receiver_->Send(new ViewMsg_Resource_RequestComplete(routing_id_, 121 receiver_->Send(new ViewMsg_Resource_RequestComplete(routing_id_,
120 request_id, status)); 122 request_id, status));
121 123
122 // If we still have a read buffer, then see about caching it for later... 124 // If we still have a read buffer, then see about caching it for later...
123 if (spare_read_buffer_) { 125 if (spare_read_buffer_) {
124 read_buffer_ = NULL; 126 read_buffer_ = NULL;
125 } else if (read_buffer_.get()) { 127 } else if (read_buffer_.get()) {
126 read_buffer_.swap(&spare_read_buffer_); 128 read_buffer_.swap(&spare_read_buffer_);
127 } 129 }
128 return true; 130 return true;
129 } 131 }
130 132
131 // static 133 // static
132 void AsyncResourceHandler::GlobalCleanup() { 134 void AsyncResourceHandler::GlobalCleanup() {
133 spare_read_buffer_ = NULL; 135 if (spare_read_buffer_) {
136 spare_read_buffer_->Release();
137 spare_read_buffer_ = NULL;
138 }
134 } 139 }
OLDNEW
« no previous file with comments | « base/shared_memory.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698