зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1237479 -- nsScriptSecurityManager needs to use the correct user context id in the origin attributes in a few places. r=sicking
This commit is contained in:
Родитель
a4067fb951
Коммит
b9cbf42ad8
|
@ -304,7 +304,12 @@ nsScriptSecurityManager::AppStatusForPrincipal(nsIPrincipal *aPrin)
|
||||||
// The app could contain a cross-origin iframe - make sure that the content
|
// The app could contain a cross-origin iframe - make sure that the content
|
||||||
// is actually same-origin with the app.
|
// is actually same-origin with the app.
|
||||||
MOZ_ASSERT(inIsolatedMozBrowser == false, "Checked this above");
|
MOZ_ASSERT(inIsolatedMozBrowser == false, "Checked this above");
|
||||||
PrincipalOriginAttributes attrs(appId, false);
|
nsAutoCString suffix;
|
||||||
|
PrincipalOriginAttributes attrs;
|
||||||
|
NS_ENSURE_TRUE(attrs.PopulateFromOrigin(NS_ConvertUTF16toUTF8(appOrigin), suffix),
|
||||||
|
nsIPrincipal::APP_STATUS_NOT_INSTALLED);
|
||||||
|
attrs.mAppId = appId;
|
||||||
|
attrs.mInIsolatedMozBrowser = false;
|
||||||
nsCOMPtr<nsIPrincipal> appPrin = BasePrincipal::CreateCodebasePrincipal(appURI, attrs);
|
nsCOMPtr<nsIPrincipal> appPrin = BasePrincipal::CreateCodebasePrincipal(appURI, attrs);
|
||||||
NS_ENSURE_TRUE(appPrin, nsIPrincipal::APP_STATUS_NOT_INSTALLED);
|
NS_ENSURE_TRUE(appPrin, nsIPrincipal::APP_STATUS_NOT_INSTALLED);
|
||||||
return aPrin->Equals(appPrin) ? status
|
return aPrin->Equals(appPrin) ? status
|
||||||
|
|
Загрузка…
Ссылка в новой задаче