bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osr: Fix potential null ptr dereference during DnD

This commit is contained in:
Julien Bouix 2024-01-05 20:20:37 +00:00 committed by Marshall Greenblatt
parent fe119b9d65
commit 79f4ad960d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libcef/browser/osr/browser_platform_delegate_osr.cc
View File

@ -333,12 +333,20 @@ void CefBrowserPlatformDelegateOsr::DragTargetDragEnter(
const gfx::Point client_pt(event.x, event.y); const gfx::Point client_pt(event.x, event.y);
gfx::PointF transformed_pt; gfx::PointF transformed_pt;
current_rwh_for_drag_ =
web_contents->GetInputEventRouter() // Some random crashes occured when GetWeakPtr is called on a null pointer
->GetRenderWidgetHostAtPoint( // that is the return of GetRenderWidgetHostAtPoint As the root cause is not
web_contents->GetRenderViewHost()->GetWidget()->GetView(), // yet understood (no reproducible scenario yet), the current fix is only a
gfx::PointF(client_pt), &transformed_pt) // protection against null pointer dereferencing.
->GetWeakPtr(); content::RenderWidgetHostImpl* ptr_current_rwh_for_drag =
web_contents->GetInputEventRouter()->GetRenderWidgetHostAtPoint(
web_contents->GetRenderViewHost()->GetWidget()->GetView(),
gfx::PointF(client_pt), &transformed_pt);
if (!ptr_current_rwh_for_drag) {
return;
}
current_rwh_for_drag_ = ptr_current_rwh_for_drag->GetWeakPtr();
current_rvh_for_drag_ = web_contents->GetRenderViewHost(); current_rvh_for_drag_ = web_contents->GetRenderViewHost();
drag_data_ = drag_data; drag_data_ = drag_data;