mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

add a null-pointer check before processing base::SupportsUserData::GetUserData

Browse source
This commit is contained in:
Boik 2017-10-03 12:42:35 +08:00
parent 68d35dbeb1
commit d594092675
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
atom/browser/net/atom_network_delegate.cc
View file

@ -82,8 +82,12 @@ void ToDictionary(base::DictionaryValue* details, net::URLRequest* request) {
int frame_id = info->GetRenderFrameID();
auto* webContents = content::WebContents::FromRenderFrameHost(
content::RenderFrameHost::FromID(process_id, frame_id));
details->SetInteger("webContentsId",
atom::api::WebContents::GetIDFromWrappedClass(webContents));
int webContentsId = atom::api::WebContents::GetIDFromWrappedClass(
webContents);
// webContentsId must be greater than zero
if (webContentsId)
details->SetInteger("webContentsId", webContentsId);
details->SetString("resourceType",
ResourceTypeToString(info->GetResourceType()));
} else {