Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1489301 - Part 2: Fix broken [Func] condition assuming Window object, r=bzbarsky

Browse Source 
This condition unwraps the global to a window, and doesn't check before
dereferencing. This is no longer valid now that the corresponding interfaces
are exposed on BackstagePass.

Differential Revision: https://phabricator.services.mozilla.com/D9402
This commit is contained in:
Nika Layzell 2018-10-21 20:38:41 -04:00
parent 91ec325721
commit 91cec0e775
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/base/nsGlobalWindowInner.cpp
View File

@ -3095,7 +3095,8 @@ nsGlobalWindowInner::GetOwnPropertyNames(JSContext* aCx, JS::AutoIdVector& aName
nsGlobalWindowInner::IsPrivilegedChromeWindow(JSContext* aCx, JSObject* aObj)
{
// For now, have to deal with XPConnect objects here.
return xpc::WindowOrNull(aObj)->IsChromeWindow() &&
nsGlobalWindowInner* win = xpc::WindowOrNull(aObj);
return win && win->IsChromeWindow() &&
nsContentUtils::ObjectPrincipal(aObj) == nsContentUtils::GetSystemPrincipal();
}