Fixing bustage in a different way! Courtesy: Heikki

This commit is contained in:
harishd%netscape.com 2003-03-25 02:02:33 +00:00
parent 4e4680c4c1
commit df21499ff9
2 changed files with 4 additions and 8 deletions

View File

@ -542,10 +542,8 @@ nsWebScriptsAccess::CheckAccess(AccessInfoEntry* aEntry,
NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index)); NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index));
NS_ASSERTION(access_info, "Entry is missing attribute information"); NS_ASSERTION(access_info, "Entry is missing attribute information");
const nsAString& type = if (!access_info->mType || kAny.Equals(access_info->mType) ||
access_info->mType ? aRequestType.Equals(access_info->mType)) {
nsDependentString(access_info->mType) : nsDependentString(kAny.get());
if (type.Equals(kAny) || type.Equals(aRequestType)) {
if (!access_info->mFrom) { if (!access_info->mFrom) {
// If "from" is not specified, then all scripts will be allowed // If "from" is not specified, then all scripts will be allowed
*aAccessGranted = PR_TRUE; *aAccessGranted = PR_TRUE;

View File

@ -542,10 +542,8 @@ nsWebScriptsAccess::CheckAccess(AccessInfoEntry* aEntry,
NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index)); NS_REINTERPRET_CAST(AccessInfo*, aEntry->mInfoArray.ElementAt(index));
NS_ASSERTION(access_info, "Entry is missing attribute information"); NS_ASSERTION(access_info, "Entry is missing attribute information");
const nsAString& type = if (!access_info->mType || kAny.Equals(access_info->mType) ||
access_info->mType ? aRequestType.Equals(access_info->mType)) {
nsDependentString(access_info->mType) : nsDependentString(kAny.get());
if (type.Equals(kAny) || type.Equals(aRequestType)) {
if (!access_info->mFrom) { if (!access_info->mFrom) {
// If "from" is not specified, then all scripts will be allowed // If "from" is not specified, then all scripts will be allowed
*aAccessGranted = PR_TRUE; *aAccessGranted = PR_TRUE;