From 2e94bfafeae70f41d1f2a8e23591831204b4b315 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 21 Aug 2020 17:18:45 -0400 Subject: [PATCH] wrapper: Allow null stream parameter to CefStreamResourceHandler --- libcef_dll/wrapper/cef_stream_resource_handler.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libcef_dll/wrapper/cef_stream_resource_handler.cc b/libcef_dll/wrapper/cef_stream_resource_handler.cc index ad5a34faf..62fbfb127 100644 --- a/libcef_dll/wrapper/cef_stream_resource_handler.cc +++ b/libcef_dll/wrapper/cef_stream_resource_handler.cc @@ -18,7 +18,6 @@ CefStreamResourceHandler::CefStreamResourceHandler( mime_type_(mime_type), stream_(stream) { DCHECK(!mime_type_.empty()); - DCHECK(stream_.get()); } CefStreamResourceHandler::CefStreamResourceHandler( @@ -33,7 +32,6 @@ CefStreamResourceHandler::CefStreamResourceHandler( header_map_(header_map), stream_(stream) { DCHECK(!mime_type_.empty()); - DCHECK(stream_.get()); } bool CefStreamResourceHandler::Open(CefRefPtr request, @@ -59,7 +57,7 @@ void CefStreamResourceHandler::GetResponseHeaders( if (!header_map_.empty()) response->SetHeaderMap(header_map_); - response_length = -1; + response_length = stream_ ? -1 : 0; } bool CefStreamResourceHandler::Read( @@ -69,6 +67,7 @@ bool CefStreamResourceHandler::Read( CefRefPtr callback) { DCHECK(!CefCurrentlyOn(TID_UI) && !CefCurrentlyOn(TID_IO)); DCHECK_GT(bytes_to_read, 0); + DCHECK(stream_); // Read until the buffer is full or until Read() returns 0 to indicate no // more data.