From 431fc0ac733f36ee4d6921202f1390b910f19590 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Wed, 3 Feb 2010 18:21:58 +0000 Subject: [PATCH] libcef: - Fix possible dereference of empty request_ value in RequestProxy. (Issue #70) git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@68 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/browser_resource_loader_bridge.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libcef/browser_resource_loader_bridge.cc b/libcef/browser_resource_loader_bridge.cc index 4c89cbb99..4178ba138 100644 --- a/libcef/browser_resource_loader_bridge.cc +++ b/libcef/browser_resource_loader_bridge.cc @@ -319,7 +319,8 @@ class RequestProxy : public URLRequest::Delegate, if (!resource_stream_.get() && !request_.get()) return; - request_->Cancel(); + if (request_.get()) + request_->Cancel(); Done(); } @@ -441,13 +442,12 @@ class RequestProxy : public URLRequest::Delegate, OnCompletedRequest(URLRequestStatus(URLRequestStatus::SUCCESS, 0), std::string()); resource_stream_ = NULL; - } else { + } else if(request_.get()) { if (upload_progress_timer_.IsRunning()) { MaybeUpdateUploadProgress(); upload_progress_timer_.Stop(); } - DCHECK(request_.get()); OnCompletedRequest(request_->status(), std::string()); request_.reset(); // destroy on the io thread }