mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for XBL being able to execute scripts in skins. Bugzilla is down, so I can't give the number. r=danm

This commit is contained in:
hyatt%netscape.com 2000-07-12 00:17:07 +00:00
Родитель f063bf2c8f
Коммит 3499d7d56b
2 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
chrome/src/nsChromeRegistry.cpp
Просмотреть файл

@ -1710,8 +1710,8 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
}
}
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL and
// the package arcs.
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts
// and package arcs.
if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) {
// Iterate over our kids a second time.
nsCOMPtr<nsISimpleEnumerator> seqKids;
@ -1724,7 +1724,9 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
nsCOMPtr<nsIRDFResource> entry(do_QueryInterface(supp));
if (entry) {
nsChromeRegistry::UpdateArc(installSource, entry, mBaseURL, baseLiteral, aRemove);
if (aProviderType.Equals(nsCAutoString("skin")) && !aAllowScripts)
nsChromeRegistry::UpdateArc(installSource, entry, mAllowScripts, scriptLiteral, aRemove);
// Now set up the package arc.
const char* val;
entry->GetValueConst(&val);
@ -1764,8 +1766,6 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
// We are the main entry for a skin/locale.
// Set up our loctype and our script access
nsChromeRegistry::UpdateArc(installSource, resource, mLocType, locLiteral, aRemove);
if (aProviderType.Equals(nsCAutoString("skin")) && !aAllowScripts)
nsChromeRegistry::UpdateArc(installSource, resource, mAllowScripts, scriptLiteral, aRemove);
}
nsCOMPtr<nsIRDFNode> newTarget;

10
rdf/chrome/src/nsChromeRegistry.cpp
Просмотреть файл

@ -1710,8 +1710,8 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
}
}
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL and
// the package arcs.
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts
// and package arcs.
if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) {
// Iterate over our kids a second time.
nsCOMPtr<nsISimpleEnumerator> seqKids;
@ -1724,7 +1724,9 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
nsCOMPtr<nsIRDFResource> entry(do_QueryInterface(supp));
if (entry) {
nsChromeRegistry::UpdateArc(installSource, entry, mBaseURL, baseLiteral, aRemove);
if (aProviderType.Equals(nsCAutoString("skin")) && !aAllowScripts)
nsChromeRegistry::UpdateArc(installSource, entry, mAllowScripts, scriptLiteral, aRemove);
// Now set up the package arc.
const char* val;
entry->GetValueConst(&val);
@ -1764,8 +1766,6 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
// We are the main entry for a skin/locale.
// Set up our loctype and our script access
nsChromeRegistry::UpdateArc(installSource, resource, mLocType, locLiteral, aRemove);
if (aProviderType.Equals(nsCAutoString("skin")) && !aAllowScripts)
nsChromeRegistry::UpdateArc(installSource, resource, mAllowScripts, scriptLiteral, aRemove);
}
nsCOMPtr<nsIRDFNode> newTarget;