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

Back out bug 246699 to fix bug 423375, per shaver

Browse Source
This commit is contained in:
gavin@gavinsharp.com 2008-03-17 07:10:48 -07:00
parent 8875d02d1b
commit 0fa7ce606a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
caps/src/nsScriptSecurityManager.cpp
View File

@ -149,13 +149,18 @@ GetScriptContext(JSContext *cx)
inline void SetPendingException(JSContext *cx, const char *aMsg)
{
JSAutoRequest ar(cx);
JS_ReportError(cx, "%s", aMsg);
JSString *str = JS_NewStringCopyZ(cx, aMsg);
if (str)
JS_SetPendingException(cx, STRING_TO_JSVAL(str));
}
inline void SetPendingException(JSContext *cx, const PRUnichar *aMsg)
{
JSAutoRequest ar(cx);
JS_ReportError(cx, "%hs", aMsg);
JSString *str = JS_NewUCStringCopyZ(cx,
reinterpret_cast<const jschar*>(aMsg));
if (str)
JS_SetPendingException(cx, STRING_TO_JSVAL(str));
}
// DomainPolicy members
@ -700,7 +705,7 @@ nsScriptSecurityManager::CheckSameOrigin(JSContext* cx,
if (!SecurityCompareURIs(sourceURI, aTargetURI))
{
ReportError(cx, NS_LITERAL_STRING("CheckSameOriginError"), sourceURI, aTargetURI);
return NS_OK;
return NS_ERROR_DOM_BAD_URI;
}
return NS_OK;
}
@ -715,7 +720,6 @@ nsScriptSecurityManager::CheckSameOriginURI(nsIURI* aSourceURI,
if (reportError) {
ReportError(nsnull, NS_LITERAL_STRING("CheckSameOriginError"),
aSourceURI, aTargetURI);
return NS_OK;
}
return NS_ERROR_DOM_BAD_URI;
}
@ -1283,7 +1287,7 @@ nsScriptSecurityManager::CheckLoadURIFromScript(JSContext *cx, nsIURI *aURI)
if (NS_FAILED(aURI->GetAsciiSpec(spec)))
return NS_ERROR_FAILURE;
JS_ReportError(cx, "Access to '%s' from script denied", spec.get());
return NS_OK;
return NS_ERROR_DOM_BAD_URI;
}
NS_IMETHODIMP