diff options
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/gdata/gdata_uploader.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata_uploader.cc b/chrome/browser/chromeos/gdata/gdata_uploader.cc index c2be139..b0bffd1 100644 --- a/chrome/browser/chromeos/gdata/gdata_uploader.cc +++ b/chrome/browser/chromeos/gdata/gdata_uploader.cc @@ -386,10 +386,12 @@ void GDataUploader::UploadFailed(scoped_ptr<UploadFileInfo> upload_file_info, RemoveUpload(upload_file_info->upload_id); LOG(ERROR) << "Upload failed " << upload_file_info->DebugString(); - if (!upload_file_info->completion_callback.is_null()) { - upload_file_info->completion_callback.Run(error, - upload_file_info.Pass()); - } + // This is subtle but we should take the callback reference before + // calling upload_file_info.Pass(). Otherwise, it'll crash. + const UploadFileInfo::UploadCompletionCallback& callback = + upload_file_info->completion_callback; + if (!callback.is_null()) + callback.Run(error, upload_file_info.Pass()); } void GDataUploader::RemoveUpload(int upload_id) { |