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

Side by Side Diff: net/base/file_stream_context.h

Issue 920123002: Fix a crash in the FileStream::Context::Read code path where we were invoking a NULL callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 5 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
« no previous file with comments | « no previous file | net/base/file_stream_context_win.cc » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // This file defines FileStream::Context class. 5 // This file defines FileStream::Context class.
6 // The general design of FileStream is as follows: file_stream.h defines 6 // The general design of FileStream is as follows: file_stream.h defines
7 // FileStream class which basically is just an "wrapper" not containing any 7 // FileStream class which basically is just an "wrapper" not containing any
8 // specific implementation details. It re-routes all its method calls to 8 // specific implementation details. It re-routes all its method calls to
9 // the instance of FileStream::Context (FileStream holds a scoped_ptr to 9 // the instance of FileStream::Context (FileStream holds a scoped_ptr to
10 // FileStream::Context instance). Context was extracted into a different class 10 // FileStream::Context instance). Context was extracted into a different class
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 void IOCompletionIsPending(const CompletionCallback& callback, IOBuffer* buf); 157 void IOCompletionIsPending(const CompletionCallback& callback, IOBuffer* buf);
158 158
159 // Implementation of MessageLoopForIO::IOHandler. 159 // Implementation of MessageLoopForIO::IOHandler.
160 virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context, 160 virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context,
161 DWORD bytes_read, 161 DWORD bytes_read,
162 DWORD error) override; 162 DWORD error) override;
163 163
164 // Invokes the user callback. 164 // Invokes the user callback.
165 void InvokeUserCallback(); 165 void InvokeUserCallback();
166 166
167 // Deletes an orphaned context.
168 void DeleteOrphanedContext();
169
167 // The ReadFile call on Windows can execute synchonously at times. 170 // The ReadFile call on Windows can execute synchonously at times.
168 // http://support.microsoft.com/kb/156932. This ends up blocking the calling 171 // http://support.microsoft.com/kb/156932. This ends up blocking the calling
169 // thread which is undesirable. To avoid this we execute the ReadFile call 172 // thread which is undesirable. To avoid this we execute the ReadFile call
170 // on a worker thread. 173 // on a worker thread.
171 // The |context| parameter is a pointer to the current Context instance. It 174 // The |context| parameter is a pointer to the current Context instance. It
172 // is safe to pass this as is to the pool as the Context instance should 175 // is safe to pass this as is to the pool as the Context instance should
173 // remain valid until the pending Read operation completes. 176 // remain valid until the pending Read operation completes.
174 // The |file| parameter is the handle to the file being read. 177 // The |file| parameter is the handle to the file being read.
175 // The |buf| parameter is the buffer where we want the ReadFile to read the 178 // The |buf| parameter is the buffer where we want the ReadFile to read the
176 // data into. 179 // data into.
177 // The |buf_len| parameter contains the number of bytes to be read. 180 // The |buf_len| parameter contains the number of bytes to be read.
178 // The |overlapped| parameter is a pointer to the OVERLAPPED structure being 181 // The |overlapped| parameter is a pointer to the OVERLAPPED structure being
179 // used. 182 // used.
180 // The |origin_thread_loop| is a MessageLoopProxy instance used to post tasks 183 // The |origin_thread_loop| is a MessageLoopProxy instance used to post tasks
181 // back to the originating thread. 184 // back to the originating thread.
182 static void ReadAsync( 185 static void ReadAsync(
183 FileStream::Context* context, 186 FileStream::Context* context,
184 HANDLE file, 187 HANDLE file,
185 scoped_refptr<net::IOBuffer> buf, 188 scoped_refptr<net::IOBuffer> buf,
186 int buf_len, 189 int buf_len,
187 OVERLAPPED* overlapped, 190 OVERLAPPED* overlapped,
188 scoped_refptr<base::MessageLoopProxy> origin_thread_loop); 191 scoped_refptr<base::MessageLoopProxy> origin_thread_loop);
189 192
190 // This callback executes on the main calling thread. It informs the caller 193 // This callback executes on the main calling thread. It informs the caller
191 // about the result of the ReadFile call. 194 // about the result of the ReadFile call.
195 // The |read_file_ret| parameter contains the return value of the ReadFile
196 // call.
192 // The |bytes_read| contains the number of bytes read from the file, if 197 // The |bytes_read| contains the number of bytes read from the file, if
193 // ReadFile succeeds. 198 // ReadFile succeeds.
194 // The |os_error| parameter contains the value of the last error returned by 199 // The |os_error| parameter contains the value of the last error returned by
195 // the ReadFile API. 200 // the ReadFile API.
196 void ReadAsyncResult(DWORD bytes_read, DWORD os_error); 201 void ReadAsyncResult(BOOL read_file_ret, DWORD bytes_read, DWORD os_error);
197 202
198 #elif defined(OS_POSIX) 203 #elif defined(OS_POSIX)
199 // ReadFileImpl() is a simple wrapper around read() that handles EINTR 204 // ReadFileImpl() is a simple wrapper around read() that handles EINTR
200 // signals and calls RecordAndMapError() to map errno to net error codes. 205 // signals and calls RecordAndMapError() to map errno to net error codes.
201 IOResult ReadFileImpl(scoped_refptr<IOBuffer> buf, int buf_len); 206 IOResult ReadFileImpl(scoped_refptr<IOBuffer> buf, int buf_len);
202 207
203 // WriteFileImpl() is a simple wrapper around write() that handles EINTR 208 // WriteFileImpl() is a simple wrapper around write() that handles EINTR
204 // signals and calls MapSystemError() to map errno to net error codes. 209 // signals and calls MapSystemError() to map errno to net error codes.
205 // It tries to write to completion. 210 // It tries to write to completion.
206 IOResult WriteFileImpl(scoped_refptr<IOBuffer> buf, int buf_len); 211 IOResult WriteFileImpl(scoped_refptr<IOBuffer> buf, int buf_len);
(...skipping 21 matching lines...) Expand all
228 // Tracks the result of the IO completion operation. Set in OnIOComplete. 233 // Tracks the result of the IO completion operation. Set in OnIOComplete.
229 int result_; 234 int result_;
230 #endif 235 #endif
231 236
232 DISALLOW_COPY_AND_ASSIGN(Context); 237 DISALLOW_COPY_AND_ASSIGN(Context);
233 }; 238 };
234 239
235 } // namespace net 240 } // namespace net
236 241
237 #endif // NET_BASE_FILE_STREAM_CONTEXT_H_ 242 #endif // NET_BASE_FILE_STREAM_CONTEXT_H_
OLDNEW
« no previous file with comments | « no previous file | net/base/file_stream_context_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698