From 6fc5a6608b343822d260a8c8f0840f11c42291bd Mon Sep 17 00:00:00 2001 From: "norris%netscape.com" Date: Wed, 2 Feb 2000 00:22:58 +0000 Subject: [PATCH] Fix bug #25864 watch() vulnerability r=vidur,rogerl git-svn-id: svn://10.0.0.236/trunk@59445 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/idl/nsIScriptSecurityManager.idl | 5 +- .../caps/include/nsScriptSecurityManager.h | 4 +- mozilla/caps/src/nsScriptSecurityManager.cpp | 36 +- .../events/src/nsEventListenerManager.cpp | 5 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 9 +- mozilla/dom/src/base/nsJSBarProp.cpp | 18 +- mozilla/dom/src/base/nsJSDOMException.cpp | 42 +- mozilla/dom/src/base/nsJSHistory.cpp | 62 +- mozilla/dom/src/base/nsJSLocation.cpp | 132 +- mozilla/dom/src/base/nsJSMimeType.cpp | 32 +- mozilla/dom/src/base/nsJSMimeTypeArray.cpp | 31 +- mozilla/dom/src/base/nsJSNavigator.cpp | 104 +- mozilla/dom/src/base/nsJSPlugin.cpp | 52 +- mozilla/dom/src/base/nsJSPluginArray.cpp | 41 +- mozilla/dom/src/base/nsJSScreen.cpp | 60 +- mozilla/dom/src/base/nsJSUtils.cpp | 17 + mozilla/dom/src/base/nsJSUtils.h | 4 + mozilla/dom/src/base/nsJSWindow.cpp | 679 +++---- mozilla/dom/src/base/nsJSWindowCollection.cpp | 31 +- mozilla/dom/src/coreDOM/nsJSAttr.cpp | 32 +- mozilla/dom/src/coreDOM/nsJSCDATASection.cpp | 4 +- mozilla/dom/src/coreDOM/nsJSCharacterData.cpp | 75 +- mozilla/dom/src/coreDOM/nsJSComment.cpp | 4 +- .../dom/src/coreDOM/nsJSDOMImplementation.cpp | 14 +- mozilla/dom/src/coreDOM/nsJSDocument.cpp | 163 +- .../dom/src/coreDOM/nsJSDocumentFragment.cpp | 4 +- mozilla/dom/src/coreDOM/nsJSDocumentType.cpp | 25 +- mozilla/dom/src/coreDOM/nsJSElement.cpp | 91 +- mozilla/dom/src/coreDOM/nsJSEntity.cpp | 25 +- .../dom/src/coreDOM/nsJSEntityReference.cpp | 4 +- mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp | 51 +- mozilla/dom/src/coreDOM/nsJSNode.cpp | 168 +- mozilla/dom/src/coreDOM/nsJSNodeList.cpp | 21 +- mozilla/dom/src/coreDOM/nsJSNotation.cpp | 18 +- .../src/coreDOM/nsJSProcessingInstruction.cpp | 25 +- mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp | 32 +- .../src/coreDOM/nsJSStyleSheetCollection.cpp | 21 +- mozilla/dom/src/coreDOM/nsJSText.cpp | 14 +- mozilla/dom/src/css/nsJSCSS2Properties.cpp | 1740 +++++++---------- mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp | 18 +- mozilla/dom/src/css/nsJSCSSImportRule.cpp | 39 +- mozilla/dom/src/css/nsJSCSSMediaRule.cpp | 45 +- mozilla/dom/src/css/nsJSCSSPageRule.cpp | 32 +- mozilla/dom/src/css/nsJSCSSRule.cpp | 32 +- .../dom/src/css/nsJSCSSStyleDeclaration.cpp | 65 +- mozilla/dom/src/css/nsJSCSSStyleRule.cpp | 32 +- .../src/css/nsJSCSSStyleRuleCollection.cpp | 21 +- mozilla/dom/src/css/nsJSCSSStyleSheet.cpp | 66 +- mozilla/dom/src/css/nsJSCSSUnknownRule.cpp | 4 +- mozilla/dom/src/events/nsJSEvent.cpp | 86 +- mozilla/dom/src/events/nsJSKeyEvent.cpp | 115 +- mozilla/dom/src/events/nsJSUIEvent.cpp | 98 +- .../dom/src/html/nsJSHTMLAnchorElement.cpp | 192 +- .../dom/src/html/nsJSHTMLAppletElement.cpp | 158 +- mozilla/dom/src/html/nsJSHTMLAreaElement.cpp | 116 +- mozilla/dom/src/html/nsJSHTMLBRElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLBaseElement.cpp | 32 +- .../dom/src/html/nsJSHTMLBaseFontElement.cpp | 46 +- mozilla/dom/src/html/nsJSHTMLBodyElement.cpp | 88 +- .../dom/src/html/nsJSHTMLButtonElement.cpp | 108 +- mozilla/dom/src/html/nsJSHTMLCollection.cpp | 31 +- mozilla/dom/src/html/nsJSHTMLDListElement.cpp | 18 +- .../dom/src/html/nsJSHTMLDirectoryElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLDivElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLDocument.cpp | 320 ++- mozilla/dom/src/html/nsJSHTMLElement.cpp | 81 +- mozilla/dom/src/html/nsJSHTMLEmbedElement.cpp | 88 +- .../dom/src/html/nsJSHTMLFieldSetElement.cpp | 11 +- mozilla/dom/src/html/nsJSHTMLFontElement.cpp | 46 +- .../dom/src/html/nsJSHTMLFormControlList.cpp | 24 +- mozilla/dom/src/html/nsJSHTMLFormElement.cpp | 149 +- mozilla/dom/src/html/nsJSHTMLFrameElement.cpp | 116 +- .../dom/src/html/nsJSHTMLFrameSetElement.cpp | 32 +- mozilla/dom/src/html/nsJSHTMLHRElement.cpp | 60 +- mozilla/dom/src/html/nsJSHTMLHeadElement.cpp | 18 +- .../dom/src/html/nsJSHTMLHeadingElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp | 18 +- .../dom/src/html/nsJSHTMLIFrameElement.cpp | 144 +- mozilla/dom/src/html/nsJSHTMLImageElement.cpp | 193 +- mozilla/dom/src/html/nsJSHTMLInputElement.cpp | 303 ++- .../dom/src/html/nsJSHTMLIsIndexElement.cpp | 25 +- mozilla/dom/src/html/nsJSHTMLLIElement.cpp | 32 +- mozilla/dom/src/html/nsJSHTMLLabelElement.cpp | 39 +- mozilla/dom/src/html/nsJSHTMLLayerElement.cpp | 109 +- .../dom/src/html/nsJSHTMLLegendElement.cpp | 39 +- mozilla/dom/src/html/nsJSHTMLLinkElement.cpp | 130 +- mozilla/dom/src/html/nsJSHTMLMapElement.cpp | 25 +- mozilla/dom/src/html/nsJSHTMLMenuElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLMetaElement.cpp | 60 +- mozilla/dom/src/html/nsJSHTMLModElement.cpp | 32 +- mozilla/dom/src/html/nsJSHTMLOListElement.cpp | 46 +- .../dom/src/html/nsJSHTMLObjectElement.cpp | 249 +-- .../dom/src/html/nsJSHTMLOptGroupElement.cpp | 32 +- .../dom/src/html/nsJSHTMLOptionElement.cpp | 109 +- .../dom/src/html/nsJSHTMLParagraphElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLParamElement.cpp | 60 +- mozilla/dom/src/html/nsJSHTMLPreElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp | 18 +- .../dom/src/html/nsJSHTMLScriptElement.cpp | 102 +- .../dom/src/html/nsJSHTMLSelectElement.cpp | 180 +- mozilla/dom/src/html/nsJSHTMLStyleElement.cpp | 46 +- .../src/html/nsJSHTMLTableCaptionElement.cpp | 18 +- .../dom/src/html/nsJSHTMLTableCellElement.cpp | 214 +- .../dom/src/html/nsJSHTMLTableColElement.cpp | 88 +- mozilla/dom/src/html/nsJSHTMLTableElement.cpp | 266 ++- .../dom/src/html/nsJSHTMLTableRowElement.cpp | 136 +- .../src/html/nsJSHTMLTableSectionElement.cpp | 87 +- .../dom/src/html/nsJSHTMLTextAreaElement.cpp | 181 +- mozilla/dom/src/html/nsJSHTMLTitleElement.cpp | 18 +- mozilla/dom/src/html/nsJSHTMLUListElement.cpp | 32 +- mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 5 + mozilla/dom/src/range/nsJSRange.cpp | 236 +-- mozilla/dom/src/range/nsJSSelection.cpp | 186 +- .../dom/src/range/nsJSSelectionListener.cpp | 14 +- .../dom/src/xul/nsJSXULCommandDispatcher.cpp | 82 +- mozilla/dom/src/xul/nsJSXULDocument.cpp | 76 +- mozilla/dom/src/xul/nsJSXULElement.cpp | 127 +- mozilla/dom/src/xul/nsJSXULTreeElement.cpp | 192 +- mozilla/dom/tools/JSStubGen.cpp | 23 +- mozilla/js/src/jsobj.c | 2 +- .../events/src/nsEventListenerManager.cpp | 5 +- .../content/src/nsJSXULCommandDispatcher.cpp | 82 +- mozilla/rdf/content/src/nsJSXULDocument.cpp | 76 +- .../rdf/content/src/nsJSXULEditorElement.cpp | 11 +- mozilla/rdf/content/src/nsJSXULElement.cpp | 127 +- .../rdf/content/src/nsJSXULPopupElement.cpp | 24 +- .../rdf/content/src/nsJSXULTreeElement.cpp | 192 +- .../xpfe/AppCores/src/nsJSAppCoresManager.cpp | 54 +- mozilla/xpfe/AppCores/src/nsJSBaseAppCore.cpp | 31 +- mozilla/xpfe/AppCores/src/nsJSToolkitCore.cpp | 54 +- 130 files changed, 4822 insertions(+), 6216 deletions(-) diff --git a/mozilla/caps/idl/nsIScriptSecurityManager.idl b/mozilla/caps/idl/nsIScriptSecurityManager.idl index cbab9c101db..965cb0c29eb 100644 --- a/mozilla/caps/idl/nsIScriptSecurityManager.idl +++ b/mozilla/caps/idl/nsIScriptSecurityManager.idl @@ -41,10 +41,9 @@ interface nsIScriptSecurityManager : nsISupports * @param obj The object that is being accessed * @param prop The ordinal of the property being accessed (see nsDOMPropEnums.h) * @param isWrite True if write access is being attempted - * @return True if access is granted */ - boolean CheckScriptAccess(in JSContextPtr cx, in voidStar obj, - in long prop, in boolean isWrite); + void CheckScriptAccess(in JSContextPtr cx, in voidStar obj, + in long prop, in boolean isWrite); /** * Check that the script with context "cx" can load "uri". diff --git a/mozilla/caps/include/nsScriptSecurityManager.h b/mozilla/caps/include/nsScriptSecurityManager.h index 2e042d348f7..d5b8fca9786 100644 --- a/mozilla/caps/include/nsScriptSecurityManager.h +++ b/mozilla/caps/include/nsScriptSecurityManager.h @@ -63,8 +63,8 @@ private: GetObjectPrincipal(JSContext *aCx, JSObject *aObj, nsIPrincipal **result); NS_IMETHOD - CheckPermissions(JSContext *aCx, JSObject *aObj, const char *aCapability, - PRBool* result); + CheckPermissions(JSContext *aCx, JSObject *aObj, const char *aCapability); + PRInt32 GetSecurityLevel(nsIPrincipal *principal, nsDOMProp domProp, PRBool isWrite, nsCString &capability); diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index 47b9167ce5d..0fa212a17e8 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -352,13 +352,11 @@ SetBit(unsigned char *bitVector, PRInt32 index) NS_IMETHODIMP nsScriptSecurityManager::CheckScriptAccess(JSContext *cx, void *aObj, PRInt32 domPropInt, - PRBool isWrite, PRBool *aResult) + PRBool isWrite) { nsDOMProp domProp = (nsDOMProp) domPropInt; - *aResult = PR_FALSE; if (!GetBit(hasPolicyVector, domPropInt)) { // No policy for this DOM property, so just allow access. - *aResult = PR_TRUE; return NS_OK; } nsCOMPtr principal; @@ -370,7 +368,6 @@ nsScriptSecurityManager::CheckScriptAccess(JSContext *cx, NS_SUCCEEDED(principal->Equals(mSystemPrincipal, &equals)) && equals) { // We have native code or the system principal: just allow access - *aResult = PR_TRUE; return NS_OK; } nsCAutoString capability; @@ -383,20 +380,22 @@ nsScriptSecurityManager::CheckScriptAccess(JSContext *cx, // to specify the large majority of unchecked properties, only the // minority of checked ones. case SCRIPT_SECURITY_ALL_ACCESS: - *aResult = PR_TRUE; return NS_OK; case SCRIPT_SECURITY_SAME_DOMAIN_ACCESS: { const char *cap = isWrite ? "UniversalBrowserWrite" : "UniversalBrowserRead"; - return CheckPermissions(cx, (JSObject *) aObj, cap, aResult); + return CheckPermissions(cx, (JSObject *) aObj, cap); + } + case SCRIPT_SECURITY_CAPABILITY_ONLY: { + PRBool capabilityEnabled = PR_FALSE; + nsresult rv = IsCapabilityEnabled(capability, &capabilityEnabled); + if (NS_FAILED(rv) || !capabilityEnabled) + return NS_ERROR_DOM_SECURITY_ERR; } - case SCRIPT_SECURITY_CAPABILITY_ONLY: - return IsCapabilityEnabled(capability, aResult); default: // Default is no access - *aResult = PR_FALSE; - return NS_OK; + return NS_ERROR_DOM_SECURITY_ERR; } } @@ -972,8 +971,7 @@ nsScriptSecurityManager::GetObjectPrincipal(JSContext *aCx, JSObject *aObj, NS_IMETHODIMP nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, - const char *aCapability, - PRBool* aResult) + const char *aCapability) { /* ** Get origin of subject and object and compare. @@ -987,7 +985,6 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, if (!subject || (NS_SUCCEEDED(subject->Equals(mSystemPrincipal, &equals)) && equals)) { - *aResult = PR_TRUE; return NS_OK; } @@ -995,15 +992,15 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, if (NS_FAILED(GetObjectPrincipal(aCx, aObj, getter_AddRefs(object)))) return NS_ERROR_FAILURE; if (subject == object) { - *aResult = PR_TRUE; return NS_OK; } nsCOMPtr subjectCodebase = do_QueryInterface(subject); if (subjectCodebase) { - if (NS_FAILED(subjectCodebase->SameOrigin(object, aResult))) + PRBool isSameOrigin = PR_FALSE; + if (NS_FAILED(subjectCodebase->SameOrigin(object, &isSameOrigin))) return NS_ERROR_FAILURE; - if (*aResult) + if (isSameOrigin) return NS_OK; } @@ -1014,7 +1011,6 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, if (NS_FAILED(objectCodebase->GetOrigin(getter_Copies(origin)))) return NS_ERROR_FAILURE; if (nsCRT::strcmp(origin, "about:blank") == 0) { - *aResult = PR_TRUE; return NS_OK; } } @@ -1024,9 +1020,10 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, ** are a signed script and have permissions to do this operation. ** Check for that here */ - if (NS_FAILED(IsCapabilityEnabled(aCapability, aResult))) + PRBool capabilityEnabled = PR_FALSE; + if (NS_FAILED(IsCapabilityEnabled(aCapability, &capabilityEnabled))) return NS_ERROR_FAILURE; - if (*aResult) + if (capabilityEnabled) return NS_OK; /* @@ -1038,7 +1035,6 @@ nsScriptSecurityManager::CheckPermissions(JSContext *aCx, JSObject *aObj, JS_ReportError(aCx, "access disallowed from scripts at %s to documents " "at another domain", str); nsCRT::free(str); - *aResult = PR_FALSE; return NS_ERROR_DOM_PROP_ACCESS_DENIED; } diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 63efac093d4..25bad5963b7 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -595,14 +595,11 @@ nsresult nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *a NS_SCRIPTSECURITYMANAGER_PROGID, &rv); if (NS_FAILED(rv)) return rv; - PRBool ok; if (NS_FAILED(rv = securityManager->CheckScriptAccess(cx, jsobj, - NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_TRUE, &ok))) + NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_TRUE))) { return rv; } - if (!ok) - return NS_ERROR_DOM_PROP_ACCESS_DENIED; return SetJSEventListener(aContext, aScriptObjectOwner, aName, aIID, PR_FALSE); } diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 3ad9d3d6356..192b37a53c8 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -3729,18 +3729,17 @@ NavigatorImpl::Preference(JSContext* cx, return NS_ERROR_FAILURE; } - PRBool ok; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &result); if (NS_FAILED(result)) { return result; } - secMan->CheckScriptAccess(cx, self, NS_DOM_PROP_NAVIGATOR_PREFERENCE, - (argc == 1 ? PR_FALSE : PR_TRUE), &ok); - if (!ok) { + result = secMan->CheckScriptAccess(cx, self, NS_DOM_PROP_NAVIGATOR_PREFERENCE, + (argc == 1 ? PR_FALSE : PR_TRUE)); + if (NS_FAILED(result)) { //Need to throw error here - return NS_ERROR_FAILURE; + return result; } NS_WITH_SERVICE(nsIPref, pref, kPrefServiceCID, &result); diff --git a/mozilla/dom/src/base/nsJSBarProp.cpp b/mozilla/dom/src/base/nsJSBarProp.cpp index 9af27f45a4a..f5db73c6255 100644 --- a/mozilla/dom/src/base/nsJSBarProp.cpp +++ b/mozilla/dom/src/base/nsJSBarProp.cpp @@ -73,10 +73,9 @@ GetBarPropProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case BARPROP_VISIBLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BARPROP_VISIBLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BARPROP_VISIBLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetBarPropProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case BARPROP_VISIBLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BARPROP_VISIBLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BARPROP_VISIBLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -194,7 +192,9 @@ JSClass BarPropClass = { EnumerateBarProp, ResolveBarProp, JS_ConvertStub, - FinalizeBarProp + FinalizeBarProp, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSDOMException.cpp b/mozilla/dom/src/base/nsJSDOMException.cpp index 639bb2d4bf3..ddc20da4de5 100644 --- a/mozilla/dom/src/base/nsJSDOMException.cpp +++ b/mozilla/dom/src/base/nsJSDOMException.cpp @@ -76,10 +76,9 @@ GetDOMExceptionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case DOMEXCEPTION_CODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_CODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_CODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetDOMExceptionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOMEXCEPTION_RESULT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_RESULT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_RESULT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -112,10 +110,9 @@ GetDOMExceptionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOMEXCEPTION_MESSAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_MESSAGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_MESSAGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -130,10 +127,9 @@ GetDOMExceptionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOMEXCEPTION_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -241,16 +237,14 @@ DOMExceptionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_TOSTRING, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMEXCEPTION_TOSTRING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -281,7 +275,9 @@ JSClass DOMExceptionClass = { EnumerateDOMException, ResolveDOMException, JS_ConvertStub, - FinalizeDOMException + FinalizeDOMException, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSHistory.cpp b/mozilla/dom/src/base/nsJSHistory.cpp index f5484aa4c7b..01c59dbd75a 100644 --- a/mozilla/dom/src/base/nsJSHistory.cpp +++ b/mozilla/dom/src/base/nsJSHistory.cpp @@ -76,10 +76,9 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HISTORY_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HISTORY_CURRENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_CURRENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_CURRENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -112,10 +110,9 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HISTORY_PREVIOUS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_PREVIOUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_PREVIOUS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -130,10 +127,9 @@ GetHistoryProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HISTORY_NEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_NEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_NEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -240,16 +236,14 @@ HistoryBack(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_BACK, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_BACK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -284,16 +278,14 @@ HistoryForward(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_FORWARD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_FORWARD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -328,16 +320,14 @@ HistoryGo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_GO, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HISTORY_GO, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -368,7 +358,9 @@ JSClass HistoryClass = { EnumerateHistory, ResolveHistory, JS_ConvertStub, - FinalizeHistory + FinalizeHistory, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSLocation.cpp b/mozilla/dom/src/base/nsJSLocation.cpp index 6ab5379ddd0..9f07c3e711d 100644 --- a/mozilla/dom/src/base/nsJSLocation.cpp +++ b/mozilla/dom/src/base/nsJSLocation.cpp @@ -81,10 +81,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case LOCATION_HASH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HASH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HASH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -99,10 +98,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_HOST: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOST, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOST, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -117,10 +115,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_HOSTNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOSTNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOSTNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -135,10 +132,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PATHNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PATHNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PATHNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -153,10 +149,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PORT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PORT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PORT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -171,10 +166,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PROTOCOL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PROTOCOL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PROTOCOL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -189,10 +183,9 @@ GetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_SEARCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_SEARCH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_SEARCH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -240,10 +233,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case LOCATION_HASH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HASH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HASH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -254,10 +246,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_HOST: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOST, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOST, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -268,10 +259,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_HOSTNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOSTNAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_HOSTNAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -282,10 +272,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PATHNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PATHNAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PATHNAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -296,10 +285,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PORT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PORT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PORT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -310,10 +298,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_PROTOCOL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PROTOCOL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_PROTOCOL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -324,10 +311,9 @@ SetLocationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case LOCATION_SEARCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_SEARCH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_SEARCH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -397,16 +383,14 @@ LocationToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_TOSTRING, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_LOCATION_TOSTRING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -446,16 +430,14 @@ NSLocationReload(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSLOCATION_RELOAD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSLOCATION_RELOAD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -495,16 +477,14 @@ NSLocationReplace(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSLOCATION_REPLACE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSLOCATION_REPLACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -535,7 +515,9 @@ JSClass LocationClass = { EnumerateLocation, ResolveLocation, JS_ConvertStub, - FinalizeLocation + FinalizeLocation, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSMimeType.cpp b/mozilla/dom/src/base/nsJSMimeType.cpp index 78906ec727a..bdc5f055103 100644 --- a/mozilla/dom/src/base/nsJSMimeType.cpp +++ b/mozilla/dom/src/base/nsJSMimeType.cpp @@ -78,10 +78,9 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case MIMETYPE_DESCRIPTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_DESCRIPTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_DESCRIPTION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -96,10 +95,9 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MIMETYPE_ENABLEDPLUGIN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_ENABLEDPLUGIN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_ENABLEDPLUGIN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMPlugin* prop; nsresult result = NS_OK; @@ -115,10 +113,9 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MIMETYPE_SUFFIXES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_SUFFIXES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_SUFFIXES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -133,10 +130,9 @@ GetMimeTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MIMETYPE_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPE_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -239,7 +235,9 @@ JSClass MimeTypeClass = { EnumerateMimeType, ResolveMimeType, JS_ConvertStub, - FinalizeMimeType + FinalizeMimeType, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp index 1c4825825fd..14d64d8cf6b 100644 --- a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp +++ b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp @@ -77,10 +77,9 @@ GetMimeTypeArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case MIMETYPEARRAY_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -230,16 +229,14 @@ MimeTypeArrayItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -283,16 +280,14 @@ MimeTypeArrayNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MIMETYPEARRAY_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -328,7 +323,9 @@ JSClass MimeTypeArrayClass = { EnumerateMimeTypeArray, ResolveMimeTypeArray, JS_ConvertStub, - FinalizeMimeTypeArray + FinalizeMimeTypeArray, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSNavigator.cpp b/mozilla/dom/src/base/nsJSNavigator.cpp index 9f96ddcdd40..5d680c396a4 100644 --- a/mozilla/dom/src/base/nsJSNavigator.cpp +++ b/mozilla/dom/src/base/nsJSNavigator.cpp @@ -86,10 +86,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NAVIGATOR_APPCODENAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPCODENAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPCODENAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -104,10 +103,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_APPNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -122,10 +120,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_APPVERSION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPVERSION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_APPVERSION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -140,10 +137,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_LANGUAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_LANGUAGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_LANGUAGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -158,10 +154,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_MIMETYPES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_MIMETYPES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_MIMETYPES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMMimeTypeArray* prop; nsresult result = NS_OK; @@ -177,10 +172,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_PLATFORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PLATFORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PLATFORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -195,10 +189,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_PLUGINS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PLUGINS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PLUGINS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMPluginArray* prop; nsresult result = NS_OK; @@ -214,10 +207,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_SECURITYPOLICY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_SECURITYPOLICY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_SECURITYPOLICY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -232,10 +224,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_USERAGENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_USERAGENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_USERAGENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -250,10 +241,9 @@ GetNavigatorProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NAVIGATOR_COOKIEENABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_COOKIEENABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_COOKIEENABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -361,16 +351,14 @@ NavigatorJavaEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_JAVAENABLED, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_JAVAENABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -406,16 +394,14 @@ NavigatorTaintEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_TAINTENABLED, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_TAINTENABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -451,16 +437,14 @@ NavigatorPreference(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PREFERENCE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAVIGATOR_PREFERENCE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -491,7 +475,9 @@ JSClass NavigatorClass = { EnumerateNavigator, ResolveNavigator, JS_ConvertStub, - FinalizeNavigator + FinalizeNavigator, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSPlugin.cpp b/mozilla/dom/src/base/nsJSPlugin.cpp index ce61f8ff9aa..87539f8db0e 100644 --- a/mozilla/dom/src/base/nsJSPlugin.cpp +++ b/mozilla/dom/src/base/nsJSPlugin.cpp @@ -80,10 +80,9 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case PLUGIN_DESCRIPTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_DESCRIPTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_DESCRIPTION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case PLUGIN_FILENAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_FILENAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_FILENAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -116,10 +114,9 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case PLUGIN_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -134,10 +131,9 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case PLUGIN_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -287,16 +283,14 @@ PluginItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -340,16 +334,14 @@ PluginNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGIN_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -385,7 +377,9 @@ JSClass PluginClass = { EnumeratePlugin, ResolvePlugin, JS_ConvertStub, - FinalizePlugin + FinalizePlugin, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSPluginArray.cpp b/mozilla/dom/src/base/nsJSPluginArray.cpp index d5cbb3a52cf..03401120ffc 100644 --- a/mozilla/dom/src/base/nsJSPluginArray.cpp +++ b/mozilla/dom/src/base/nsJSPluginArray.cpp @@ -77,10 +77,9 @@ GetPluginArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case PLUGINARRAY_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -230,16 +229,14 @@ PluginArrayItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -283,16 +280,14 @@ PluginArrayNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -333,16 +328,14 @@ PluginArrayRefresh(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_REFRESH, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PLUGINARRAY_REFRESH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -380,7 +373,9 @@ JSClass PluginArrayClass = { EnumeratePluginArray, ResolvePluginArray, JS_ConvertStub, - FinalizePluginArray + FinalizePluginArray, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSScreen.cpp b/mozilla/dom/src/base/nsJSScreen.cpp index 36f87d47083..4267635e471 100644 --- a/mozilla/dom/src/base/nsJSScreen.cpp +++ b/mozilla/dom/src/base/nsJSScreen.cpp @@ -80,10 +80,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case SCREEN_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -116,10 +114,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_PIXELDEPTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_PIXELDEPTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_PIXELDEPTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -134,10 +131,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_COLORDEPTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_COLORDEPTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_COLORDEPTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -152,10 +148,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_AVAILWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -170,10 +165,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_AVAILHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -188,10 +182,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_AVAILLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILLEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILLEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -206,10 +199,9 @@ GetScreenProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SCREEN_AVAILTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILTOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SCREEN_AVAILTOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -312,7 +304,9 @@ JSClass ScreenClass = { EnumerateScreen, ResolveScreen, JS_ConvertStub, - FinalizeScreen + FinalizeScreen, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp index efc1fea45f4..2fc860d4630 100644 --- a/mozilla/dom/src/base/nsJSUtils.cpp +++ b/mozilla/dom/src/base/nsJSUtils.cpp @@ -654,3 +654,20 @@ nsJSUtils::nsGetDynamicScriptContext(JSContext *aContext, (void**)aScriptContext); } +NS_EXPORT JSBool +nsJSUtils::nsCheckAccess(JSContext *cx, JSObject *obj, + jsid id, JSAccessMode mode, + jsval *vp) +{ + if (mode == JSACC_WATCH) { + jsval value, dummy; + if (JS_IdToValue(cx, id, &value)) { + char *name = JS_GetStringBytes(JS_ValueToString(cx, value)); + return name && JS_GetProperty(cx, obj, name, &dummy); + } + return PR_FALSE; + } + return PR_TRUE; +} + + diff --git a/mozilla/dom/src/base/nsJSUtils.h b/mozilla/dom/src/base/nsJSUtils.h index ba2a4a01beb..00dfb25250c 100644 --- a/mozilla/dom/src/base/nsJSUtils.h +++ b/mozilla/dom/src/base/nsJSUtils.h @@ -137,6 +137,10 @@ public: static NS_EXPORT nsresult nsGetDynamicScriptContext(JSContext *aContext, nsIScriptContext** aScriptContext); + static NS_EXPORT JSBool nsCheckAccess(JSContext *cx, JSObject *obj, + jsid id, JSAccessMode mode, + jsval *vp); + protected: static PRBool NameAndFormatForNSResult(nsresult rv, const char** name, diff --git a/mozilla/dom/src/base/nsJSWindow.cpp b/mozilla/dom/src/base/nsJSWindow.cpp index 120645500a5..30ddc14c823 100644 --- a/mozilla/dom/src/base/nsJSWindow.cpp +++ b/mozilla/dom/src/base/nsJSWindow.cpp @@ -127,10 +127,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case WINDOW_WINDOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_WINDOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_WINDOW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -146,10 +145,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SELF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SELF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SELF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -165,10 +163,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_DOCUMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DOCUMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DOCUMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMDocument* prop; nsresult result = NS_OK; @@ -184,10 +181,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_NAVIGATOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAVIGATOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAVIGATOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNavigator* prop; nsresult result = NS_OK; @@ -203,10 +199,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCREEN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREEN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREEN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMScreen* prop; nsresult result = NS_OK; @@ -222,10 +217,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_HISTORY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_HISTORY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_HISTORY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHistory* prop; nsresult result = NS_OK; @@ -241,10 +235,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PARENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PARENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PARENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -260,10 +253,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_TOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_TOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_TOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -279,10 +271,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_CONTENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONTENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONTENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -298,10 +289,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_MENUBAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MENUBAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MENUBAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -317,10 +307,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_TOOLBAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_TOOLBAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_TOOLBAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -336,10 +325,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_LOCATIONBAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_LOCATIONBAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_LOCATIONBAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -355,10 +343,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PERSONALBAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PERSONALBAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PERSONALBAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -374,10 +361,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_STATUSBAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUSBAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUSBAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -393,10 +379,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCROLLBARS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLBARS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLBARS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -412,10 +397,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_DIRECTORIES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DIRECTORIES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DIRECTORIES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMBarProp* prop; nsresult result = NS_OK; @@ -431,10 +415,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_CLOSED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLOSED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLOSED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -449,10 +432,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_FRAMES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FRAMES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FRAMES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindowCollection* prop; nsresult result = NS_OK; @@ -468,10 +450,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_CONTROLLERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONTROLLERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIControllers* prop; nsresult result = NS_OK; @@ -487,10 +468,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_OPENER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -506,10 +486,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_STATUS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -524,10 +503,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_DEFAULTSTATUS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DEFAULTSTATUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DEFAULTSTATUS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -542,10 +520,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -560,10 +537,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_INNERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -578,10 +554,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_INNERHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -596,10 +571,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_OUTERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -614,10 +588,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_OUTERHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -632,10 +605,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCREENX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -650,10 +622,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCREENY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -668,10 +639,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PAGEXOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEXOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEXOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -686,10 +656,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PAGEYOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEYOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEYOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -704,10 +673,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCROLLX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -722,10 +690,9 @@ GetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCROLLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -773,10 +740,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case WINDOW_OPENER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -791,10 +757,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_STATUS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STATUS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -805,10 +770,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_DEFAULTSTATUS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DEFAULTSTATUS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DEFAULTSTATUS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -819,10 +783,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -833,10 +796,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_INNERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -853,10 +815,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_INNERHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_INNERHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -873,10 +834,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_OUTERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -893,10 +853,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_OUTERHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OUTERHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -913,10 +872,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCREENX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -933,10 +891,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_SCREENY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCREENY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -953,10 +910,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PAGEXOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEXOFFSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEXOFFSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -973,10 +929,9 @@ SetWindowProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case WINDOW_PAGEYOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEYOFFSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PAGEYOFFSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -1052,16 +1007,14 @@ WindowDump(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DUMP, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DUMP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1101,16 +1054,14 @@ WindowAlert(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ALERT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ALERT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1146,16 +1097,14 @@ WindowConfirm(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONFIRM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CONFIRM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1191,16 +1140,14 @@ WindowPrompt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PROMPT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PROMPT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1235,16 +1182,14 @@ WindowFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1279,16 +1224,14 @@ WindowBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1323,16 +1266,14 @@ WindowBack(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_BACK, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_BACK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1367,16 +1308,14 @@ WindowForward(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FORWARD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_FORWARD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1411,16 +1350,14 @@ WindowHome(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_HOME, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_HOME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1455,16 +1392,14 @@ WindowStop(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STOP, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_STOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1499,16 +1434,14 @@ WindowPrint(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PRINT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_PRINT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1545,16 +1478,14 @@ WindowMoveTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MOVETO, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MOVETO, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1601,16 +1532,14 @@ WindowMoveBy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MOVEBY, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_MOVEBY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1657,16 +1586,14 @@ WindowResizeTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RESIZETO, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RESIZETO, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1713,16 +1640,14 @@ WindowResizeBy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RESIZEBY, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RESIZEBY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1767,16 +1692,14 @@ WindowSizeToContent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SIZETOCONTENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SIZETOCONTENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1811,16 +1734,14 @@ WindowGetAttention(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_GETATTENTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_GETATTENTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1857,16 +1778,14 @@ WindowScroll(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1913,16 +1832,14 @@ WindowScrollTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLTO, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLTO, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1969,16 +1886,14 @@ WindowScrollBy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLBY, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SCROLLBY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2024,16 +1939,14 @@ WindowClearTimeout(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLEARTIMEOUT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLEARTIMEOUT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2076,16 +1989,14 @@ WindowClearInterval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLEARINTERVAL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLEARINTERVAL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2128,16 +2039,14 @@ WindowSetTimeout(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SETTIMEOUT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SETTIMEOUT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2173,16 +2082,14 @@ WindowSetInterval(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SETINTERVAL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_SETINTERVAL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2218,16 +2125,14 @@ WindowCaptureEvents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CAPTUREEVENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CAPTUREEVENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2270,16 +2175,14 @@ WindowReleaseEvents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RELEASEEVENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_RELEASEEVENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2322,16 +2225,14 @@ WindowRouteEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ROUTEEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ROUTEEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2377,16 +2278,14 @@ WindowEnableExternalCapture(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ENABLEEXTERNALCAPTURE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ENABLEEXTERNALCAPTURE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2421,16 +2320,14 @@ WindowDisableExternalCapture(JSContext *cx, JSObject *obj, uintN argc, jsval *ar *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DISABLEEXTERNALCAPTURE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_DISABLEEXTERNALCAPTURE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2466,16 +2363,14 @@ WindowOpen(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPEN, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPEN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2511,16 +2406,14 @@ WindowOpenDialog(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENDIALOG, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_OPENDIALOG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2555,16 +2448,14 @@ WindowClose(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLOSE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_CLOSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2601,16 +2492,14 @@ WindowEscape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ESCAPE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_ESCAPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2652,16 +2541,14 @@ WindowUnescape(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_UNESCAPE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOW_UNESCAPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2709,16 +2596,14 @@ EventTargetAddEventListener(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2775,16 +2660,14 @@ EventTargetRemoveEventListener(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_REMOVEEVENTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_REMOVEEVENTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -2829,7 +2712,9 @@ JSClass WindowClass = { EnumerateWindow, ResolveWindow, JS_ConvertStub, - FinalizeWindow + FinalizeWindow, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/base/nsJSWindowCollection.cpp b/mozilla/dom/src/base/nsJSWindowCollection.cpp index f0462e2a030..ae2364a5f25 100644 --- a/mozilla/dom/src/base/nsJSWindowCollection.cpp +++ b/mozilla/dom/src/base/nsJSWindowCollection.cpp @@ -77,10 +77,9 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case WINDOWCOLLECTION_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -230,16 +229,14 @@ WindowCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -283,16 +280,14 @@ WindowCollectionNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_WINDOWCOLLECTION_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -328,7 +323,9 @@ JSClass WindowCollectionClass = { EnumerateWindowCollection, ResolveWindowCollection, JS_ConvertStub, - FinalizeWindowCollection + FinalizeWindowCollection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSAttr.cpp b/mozilla/dom/src/coreDOM/nsJSAttr.cpp index 070650c6be1..415445b1f10 100644 --- a/mozilla/dom/src/coreDOM/nsJSAttr.cpp +++ b/mozilla/dom/src/coreDOM/nsJSAttr.cpp @@ -75,10 +75,9 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case ATTR_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case ATTR_SPECIFIED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_SPECIFIED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_SPECIFIED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case ATTR_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetAttrProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case ATTR_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ATTR_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -230,7 +226,9 @@ JSClass AttrClass = { EnumerateAttr, ResolveAttr, JS_ConvertStub, - FinalizeAttr + FinalizeAttr, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp b/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp index 2ecc615a992..fa43999dbc0 100644 --- a/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp +++ b/mozilla/dom/src/coreDOM/nsJSCDATASection.cpp @@ -156,7 +156,9 @@ JSClass CDATASectionClass = { EnumerateCDATASection, ResolveCDATASection, JS_ConvertStub, - FinalizeCDATASection + FinalizeCDATASection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp index 4ae74a46547..ffe5f91de1e 100644 --- a/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp +++ b/mozilla/dom/src/coreDOM/nsJSCharacterData.cpp @@ -74,10 +74,9 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CHARACTERDATA_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DATA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CHARACTERDATA_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetCharacterDataProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CHARACTERDATA_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DATA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DATA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -218,16 +215,14 @@ CharacterDataSubstringData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_SUBSTRINGDATA, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_SUBSTRINGDATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -273,16 +268,14 @@ CharacterDataAppendData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_APPENDDATA, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_APPENDDATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -324,16 +317,14 @@ CharacterDataInsertData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_INSERTDATA, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_INSERTDATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -378,16 +369,14 @@ CharacterDataDeleteData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DELETEDATA, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_DELETEDATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -435,16 +424,14 @@ CharacterDataReplaceData(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_REPLACEDATA, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CHARACTERDATA_REPLACEDATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -486,7 +473,9 @@ JSClass CharacterDataClass = { EnumerateCharacterData, ResolveCharacterData, JS_ConvertStub, - FinalizeCharacterData + FinalizeCharacterData, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSComment.cpp b/mozilla/dom/src/coreDOM/nsJSComment.cpp index 35a8bfb0d07..6b491f16d22 100644 --- a/mozilla/dom/src/coreDOM/nsJSComment.cpp +++ b/mozilla/dom/src/coreDOM/nsJSComment.cpp @@ -156,7 +156,9 @@ JSClass CommentClass = { EnumerateComment, ResolveComment, JS_ConvertStub, - FinalizeComment + FinalizeComment, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp b/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp index 699b405169b..37e68274657 100644 --- a/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDOMImplementation.cpp @@ -163,16 +163,14 @@ DOMImplementationHasFeature(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMIMPLEMENTATION_HASFEATURE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOMIMPLEMENTATION_HASFEATURE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -209,7 +207,9 @@ JSClass DOMImplementationClass = { EnumerateDOMImplementation, ResolveDOMImplementation, JS_ConvertStub, - FinalizeDOMImplementation + FinalizeDOMImplementation, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSDocument.cpp b/mozilla/dom/src/coreDOM/nsJSDocument.cpp index 8bedc29bf73..18cc2699c58 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocument.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocument.cpp @@ -107,10 +107,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case DOCUMENT_DOCTYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_DOCTYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_DOCTYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMDocumentType* prop; nsresult result = NS_OK; @@ -126,10 +125,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOCUMENT_IMPLEMENTATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_IMPLEMENTATION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_IMPLEMENTATION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMDOMImplementation* prop; nsresult result = NS_OK; @@ -145,10 +143,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOCUMENT_DOCUMENTELEMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_DOCUMENTELEMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_DOCUMENTELEMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMElement* prop; nsresult result = NS_OK; @@ -164,10 +161,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSDOCUMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSDocument* b; @@ -190,10 +186,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSDOCUMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSDocument* b; @@ -216,10 +211,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSDOCUMENT_STYLESHEETS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_STYLESHEETS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_STYLESHEETS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMStyleSheetCollection* prop; nsIDOMNSDocument* b; @@ -243,10 +237,9 @@ GetDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSDOCUMENT_CHARACTERSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CHARACTERSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CHARACTERSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSDocument* b; @@ -363,16 +356,14 @@ DocumentCreateElement(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEELEMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEELEMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -413,16 +404,14 @@ DocumentCreateDocumentFragment(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEDOCUMENTFRAGMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEDOCUMENTFRAGMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -459,16 +448,14 @@ DocumentCreateTextNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATETEXTNODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATETEXTNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -510,16 +497,14 @@ DocumentCreateComment(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATECOMMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATECOMMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -561,16 +546,14 @@ DocumentCreateCDATASection(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATECDATASECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATECDATASECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -613,16 +596,14 @@ DocumentCreateProcessingInstruction(JSContext *cx, JSObject *obj, uintN argc, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEPROCESSINGINSTRUCTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEPROCESSINGINSTRUCTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -665,16 +646,14 @@ DocumentCreateAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -716,16 +695,14 @@ DocumentCreateEntityReference(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEENTITYREFERENCE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_CREATEENTITYREFERENCE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -767,16 +744,14 @@ DocumentGetElementsByTagName(JSContext *cx, JSObject *obj, uintN argc, jsval *ar *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_GETELEMENTSBYTAGNAME, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENT_GETELEMENTSBYTAGNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -824,16 +799,14 @@ NSDocumentCreateElementWithNameSpace(JSContext *cx, JSObject *obj, uintN argc, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CREATEELEMENTWITHNAMESPACE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CREATEELEMENTWITHNAMESPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -880,16 +853,14 @@ NSDocumentCreateRange(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CREATERANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSDOCUMENT_CREATERANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -920,7 +891,9 @@ JSClass DocumentClass = { EnumerateDocument, ResolveDocument, JS_ConvertStub, - FinalizeDocument + FinalizeDocument, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp b/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp index 0a02c64e8e6..de0cea79153 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocumentFragment.cpp @@ -156,7 +156,9 @@ JSClass DocumentFragmentClass = { EnumerateDocumentFragment, ResolveDocumentFragment, JS_ConvertStub, - FinalizeDocumentFragment + FinalizeDocumentFragment, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp index ccc4ba5739e..87a895eca3f 100644 --- a/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp +++ b/mozilla/dom/src/coreDOM/nsJSDocumentType.cpp @@ -77,10 +77,9 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case DOCUMENTTYPE_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -95,10 +94,9 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOCUMENTTYPE_ENTITIES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_ENTITIES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_ENTITIES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNamedNodeMap* prop; nsresult result = NS_OK; @@ -114,10 +112,9 @@ GetDocumentTypeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case DOCUMENTTYPE_NOTATIONS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_NOTATIONS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_DOCUMENTTYPE_NOTATIONS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNamedNodeMap* prop; nsresult result = NS_OK; @@ -221,7 +218,9 @@ JSClass DocumentTypeClass = { EnumerateDocumentType, ResolveDocumentType, JS_ConvertStub, - FinalizeDocumentType + FinalizeDocumentType, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSElement.cpp b/mozilla/dom/src/coreDOM/nsJSElement.cpp index fd36746f412..2d6bbddc3d7 100644 --- a/mozilla/dom/src/coreDOM/nsJSElement.cpp +++ b/mozilla/dom/src/coreDOM/nsJSElement.cpp @@ -77,10 +77,9 @@ GetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case ELEMENT_TAGNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_TAGNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_TAGNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -189,16 +188,14 @@ ElementGetAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -240,16 +237,14 @@ ElementSetAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_SETATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_SETATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -291,16 +286,14 @@ ElementRemoveAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_REMOVEATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_REMOVEATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -342,16 +335,14 @@ ElementGetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETATTRIBUTENODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETATTRIBUTENODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -393,16 +384,14 @@ ElementSetAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_SETATTRIBUTENODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_SETATTRIBUTENODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -450,16 +439,14 @@ ElementRemoveAttributeNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_REMOVEATTRIBUTENODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_REMOVEATTRIBUTENODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -507,16 +494,14 @@ ElementGetElementsByTagName(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETELEMENTSBYTAGNAME, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_GETELEMENTSBYTAGNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -556,16 +541,14 @@ ElementNormalize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_NORMALIZE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ELEMENT_NORMALIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -596,7 +579,9 @@ JSClass ElementClass = { EnumerateElement, ResolveElement, JS_ConvertStub, - FinalizeElement + FinalizeElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSEntity.cpp b/mozilla/dom/src/coreDOM/nsJSEntity.cpp index d53b71bdcf7..4b50ecbc6b0 100644 --- a/mozilla/dom/src/coreDOM/nsJSEntity.cpp +++ b/mozilla/dom/src/coreDOM/nsJSEntity.cpp @@ -75,10 +75,9 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case ENTITY_PUBLICID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_PUBLICID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_PUBLICID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case ENTITY_SYSTEMID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_SYSTEMID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_SYSTEMID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetEntityProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case ENTITY_NOTATIONNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_NOTATIONNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_ENTITY_NOTATIONNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -217,7 +214,9 @@ JSClass EntityClass = { EnumerateEntity, ResolveEntity, JS_ConvertStub, - FinalizeEntity + FinalizeEntity, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp b/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp index 8a9ea5de51f..62855e309c1 100644 --- a/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp +++ b/mozilla/dom/src/coreDOM/nsJSEntityReference.cpp @@ -156,7 +156,9 @@ JSClass EntityReferenceClass = { EnumerateEntityReference, ResolveEntityReference, JS_ConvertStub, - FinalizeEntityReference + FinalizeEntityReference, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp index 33c6f3bc662..4a4becb306f 100644 --- a/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNamedNodeMap.cpp @@ -75,10 +75,9 @@ GetNamedNodeMapProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NAMEDNODEMAP_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -198,16 +197,14 @@ NamedNodeMapGetNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_GETNAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_GETNAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -249,16 +246,14 @@ NamedNodeMapSetNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_SETNAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_SETNAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -306,16 +301,14 @@ NamedNodeMapRemoveNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_REMOVENAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_REMOVENAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -357,16 +350,14 @@ NamedNodeMapItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NAMEDNODEMAP_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -404,7 +395,9 @@ JSClass NamedNodeMapClass = { EnumerateNamedNodeMap, ResolveNamedNodeMap, JS_ConvertStub, - FinalizeNamedNodeMap + FinalizeNamedNodeMap, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSNode.cpp b/mozilla/dom/src/coreDOM/nsJSNode.cpp index d5d28a6f495..621fdceb889 100644 --- a/mozilla/dom/src/coreDOM/nsJSNode.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNode.cpp @@ -93,10 +93,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NODE_NODENAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODENAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODENAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +110,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_NODEVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODEVALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODEVALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -129,10 +127,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_NODETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODETYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODETYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint16 prop; nsresult result = NS_OK; @@ -147,10 +144,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_PARENTNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_PARENTNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_PARENTNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -166,10 +162,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_CHILDNODES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_CHILDNODES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_CHILDNODES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNodeList* prop; nsresult result = NS_OK; @@ -185,10 +180,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_FIRSTCHILD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_FIRSTCHILD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_FIRSTCHILD, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -204,10 +198,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_LASTCHILD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_LASTCHILD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_LASTCHILD, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -223,10 +216,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_PREVIOUSSIBLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_PREVIOUSSIBLING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_PREVIOUSSIBLING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -242,10 +234,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_NEXTSIBLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NEXTSIBLING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NEXTSIBLING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -261,10 +252,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_ATTRIBUTES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_ATTRIBUTES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_ATTRIBUTES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNamedNodeMap* prop; nsresult result = NS_OK; @@ -280,10 +270,9 @@ GetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NODE_OWNERDOCUMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_OWNERDOCUMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_OWNERDOCUMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMDocument* prop; nsresult result = NS_OK; @@ -332,10 +321,9 @@ SetNodeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NODE_NODEVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODEVALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_NODEVALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -407,16 +395,14 @@ NodeInsertBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_INSERTBEFORE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_INSERTBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -472,16 +458,14 @@ NodeReplaceChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_REPLACECHILD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_REPLACECHILD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -536,16 +520,14 @@ NodeRemoveChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_REMOVECHILD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_REMOVECHILD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -593,16 +575,14 @@ NodeAppendChild(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_APPENDCHILD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_APPENDCHILD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -649,16 +629,14 @@ NodeHasChildNodes(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_HASCHILDNODES, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_HASCHILDNODES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -695,16 +673,14 @@ NodeCloneNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_CLONENODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODE_CLONENODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -754,16 +730,14 @@ EventTargetAddEventListener(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -820,16 +794,14 @@ EventTargetRemoveEventListener(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_REMOVEEVENTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENTTARGET_REMOVEEVENTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -874,7 +846,9 @@ JSClass NodeClass = { EnumerateNode, ResolveNode, JS_ConvertStub, - FinalizeNode + FinalizeNode, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp index 5bf2d67c167..12aae1fd3ba 100644 --- a/mozilla/dom/src/coreDOM/nsJSNodeList.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNodeList.cpp @@ -75,10 +75,9 @@ GetNodeListProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NODELIST_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODELIST_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODELIST_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -198,16 +197,14 @@ NodeListItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODELIST_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NODELIST_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -245,7 +242,9 @@ JSClass NodeListClass = { EnumerateNodeList, ResolveNodeList, JS_ConvertStub, - FinalizeNodeList + FinalizeNodeList, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSNotation.cpp b/mozilla/dom/src/coreDOM/nsJSNotation.cpp index ef3c2b7df48..68f019af0ed 100644 --- a/mozilla/dom/src/coreDOM/nsJSNotation.cpp +++ b/mozilla/dom/src/coreDOM/nsJSNotation.cpp @@ -74,10 +74,9 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NOTATION_PUBLICID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NOTATION_PUBLICID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NOTATION_PUBLICID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetNotationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NOTATION_SYSTEMID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NOTATION_SYSTEMID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NOTATION_SYSTEMID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -198,7 +196,9 @@ JSClass NotationClass = { EnumerateNotation, ResolveNotation, JS_ConvertStub, - FinalizeNotation + FinalizeNotation, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp index 0cc8319c159..237f5c399cb 100644 --- a/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp +++ b/mozilla/dom/src/coreDOM/nsJSProcessingInstruction.cpp @@ -74,10 +74,9 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * switch(JSVAL_TO_INT(id)) { case PROCESSINGINSTRUCTION_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * } case PROCESSINGINSTRUCTION_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_DATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_DATA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetProcessingInstructionProperty(JSContext *cx, JSObject *obj, jsval id, jsval * switch(JSVAL_TO_INT(id)) { case PROCESSINGINSTRUCTION_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_DATA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_PROCESSINGINSTRUCTION_DATA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -211,7 +208,9 @@ JSClass ProcessingInstructionClass = { EnumerateProcessingInstruction, ResolveProcessingInstruction, JS_ConvertStub, - FinalizeProcessingInstruction + FinalizeProcessingInstruction, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp index 19063654ca7..761eb15a4ed 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp @@ -75,10 +75,9 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case STYLESHEET_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case STYLESHEET_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case STYLESHEET_READONLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_READONLY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_READONLY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case STYLESHEET_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEET_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -232,7 +228,9 @@ JSClass StyleSheetClass = { EnumerateStyleSheet, ResolveStyleSheet, JS_ConvertStub, - FinalizeStyleSheet + FinalizeStyleSheet, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp index a6446e27b4b..72aaa56308a 100644 --- a/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp +++ b/mozilla/dom/src/coreDOM/nsJSStyleSheetCollection.cpp @@ -75,10 +75,9 @@ GetStyleSheetCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case STYLESHEETCOLLECTION_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEETCOLLECTION_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEETCOLLECTION_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -198,16 +197,14 @@ StyleSheetCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEETCOLLECTION_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_STYLESHEETCOLLECTION_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -245,7 +242,9 @@ JSClass StyleSheetCollectionClass = { EnumerateStyleSheetCollection, ResolveStyleSheetCollection, JS_ConvertStub, - FinalizeStyleSheetCollection + FinalizeStyleSheetCollection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/coreDOM/nsJSText.cpp b/mozilla/dom/src/coreDOM/nsJSText.cpp index 4d129b346cb..68661d1ba2e 100644 --- a/mozilla/dom/src/coreDOM/nsJSText.cpp +++ b/mozilla/dom/src/coreDOM/nsJSText.cpp @@ -162,16 +162,14 @@ TextSplitText(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TEXT_SPLITTEXT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TEXT_SPLITTEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -209,7 +207,9 @@ JSClass TextClass = { EnumerateText, ResolveText, JS_ConvertStub, - FinalizeText + FinalizeText, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSS2Properties.cpp b/mozilla/dom/src/css/nsJSCSS2Properties.cpp index 5f0e1443c9c..3b5e8867239 100644 --- a/mozilla/dom/src/css/nsJSCSS2Properties.cpp +++ b/mozilla/dom/src/css/nsJSCSS2Properties.cpp @@ -196,10 +196,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSS2PROPERTIES_AZIMUTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_AZIMUTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_AZIMUTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -214,10 +213,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUND, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -232,10 +230,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDATTACHMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDATTACHMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDATTACHMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -250,10 +247,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -268,10 +264,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDIMAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDIMAGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDIMAGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -286,10 +281,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDPOSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDPOSITION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDPOSITION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -304,10 +298,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDREPEAT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDREPEAT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDREPEAT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -322,10 +315,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BEHAVIOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -340,10 +332,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -358,10 +349,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERCOLLAPSE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLLAPSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLLAPSE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -376,10 +366,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -394,10 +383,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSPACING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSPACING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -412,10 +400,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -430,10 +417,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -448,10 +434,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -466,10 +451,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -484,10 +468,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -502,10 +485,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -520,10 +502,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -538,10 +519,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -556,10 +536,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -574,10 +553,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -592,10 +570,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -610,10 +587,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -628,10 +604,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -646,10 +621,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -664,10 +638,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -682,10 +655,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -700,10 +672,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -718,10 +689,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -736,10 +706,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BOTTOM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BOTTOM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -754,10 +723,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CAPTIONSIDE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CAPTIONSIDE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CAPTIONSIDE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -772,10 +740,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CLEAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLEAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLEAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -790,10 +757,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CLIP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLIP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLIP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -808,10 +774,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -826,10 +791,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CONTENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CONTENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CONTENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -844,10 +808,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COUNTERINCREMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERINCREMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERINCREMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -862,10 +825,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COUNTERRESET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERRESET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERRESET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -880,10 +842,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -898,10 +859,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUEAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEAFTER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEAFTER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -916,10 +876,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUEBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEBEFORE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -934,10 +893,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CURSOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CURSOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CURSOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -952,10 +910,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_DIRECTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DIRECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DIRECTION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -970,10 +927,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_DISPLAY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DISPLAY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DISPLAY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -988,10 +944,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ELEVATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ELEVATION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ELEVATION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1006,10 +961,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_EMPTYCELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_EMPTYCELLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_EMPTYCELLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1024,10 +978,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CSSFLOAT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CSSFLOAT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CSSFLOAT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1042,10 +995,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1060,10 +1012,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTFAMILY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTFAMILY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTFAMILY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1078,10 +1029,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1096,10 +1046,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSIZEADJUST: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZEADJUST, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZEADJUST, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1114,10 +1063,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSTRETCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTRETCH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTRETCH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1132,10 +1080,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1150,10 +1097,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTVARIANT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTVARIANT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTVARIANT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1168,10 +1114,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTWEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTWEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTWEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1186,10 +1131,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1204,10 +1148,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1222,10 +1165,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LETTERSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LETTERSPACING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LETTERSPACING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1240,10 +1182,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LINEHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LINEHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LINEHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1258,10 +1199,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1276,10 +1216,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLEIMAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEIMAGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEIMAGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1294,10 +1233,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLEPOSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEPOSITION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEPOSITION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1312,10 +1250,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLETYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLETYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1330,10 +1267,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGIN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGIN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGIN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1348,10 +1284,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINTOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINTOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1366,10 +1301,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINRIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINRIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1384,10 +1318,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINBOTTOM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINBOTTOM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1402,10 +1335,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINLEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINLEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1420,10 +1352,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARKEROFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKEROFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKEROFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1438,10 +1369,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARKS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1456,10 +1386,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MAXHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1474,10 +1403,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MAXWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1492,10 +1420,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1510,10 +1437,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1528,10 +1454,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ORPHANS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ORPHANS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ORPHANS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1546,10 +1471,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1564,10 +1488,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINECOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINECOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINECOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1582,10 +1505,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINESTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINESTYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINESTYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1600,10 +1522,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINEWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINEWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINEWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1618,10 +1539,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OVERFLOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OVERFLOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OVERFLOW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1636,10 +1556,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1654,10 +1573,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGTOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGTOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1672,10 +1590,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGRIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGRIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1690,10 +1607,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGBOTTOM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGBOTTOM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1708,10 +1624,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGLEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGLEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1726,10 +1641,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1744,10 +1658,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKAFTER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKAFTER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1762,10 +1675,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKBEFORE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1780,10 +1692,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKINSIDE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKINSIDE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKINSIDE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1798,10 +1709,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1816,10 +1726,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSEAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEAFTER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEAFTER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1834,10 +1743,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSEBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEBEFORE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1852,10 +1760,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PITCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1870,10 +1777,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PITCHRANGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCHRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCHRANGE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1888,10 +1794,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PLAYDURING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PLAYDURING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PLAYDURING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1906,10 +1811,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_POSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_POSITION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_POSITION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1924,10 +1828,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_QUOTES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_QUOTES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_QUOTES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1942,10 +1845,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_RICHNESS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RICHNESS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RICHNESS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1960,10 +1862,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_RIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1978,10 +1879,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -1996,10 +1896,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAK, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2014,10 +1913,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKHEADER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKHEADER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKHEADER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2032,10 +1930,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKNUMERAL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKNUMERAL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKNUMERAL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2050,10 +1947,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKPUNCTUATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKPUNCTUATION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKPUNCTUATION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2068,10 +1964,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEECHRATE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEECHRATE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEECHRATE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2086,10 +1981,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_STRESS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_STRESS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_STRESS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2104,10 +1998,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TABLELAYOUT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TABLELAYOUT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TABLELAYOUT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2122,10 +2015,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2140,10 +2032,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTDECORATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTDECORATION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTDECORATION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2158,10 +2049,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTINDENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTINDENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTINDENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2176,10 +2066,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTSHADOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTSHADOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTSHADOW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2194,10 +2083,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTTRANSFORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTTRANSFORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTTRANSFORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2212,10 +2100,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2230,10 +2117,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_UNICODEBIDI: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_UNICODEBIDI, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_UNICODEBIDI, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2248,10 +2134,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VERTICALALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VERTICALALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VERTICALALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2266,10 +2151,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VISIBILITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VISIBILITY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VISIBILITY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2284,10 +2168,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VOICEFAMILY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOICEFAMILY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOICEFAMILY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2302,10 +2185,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VOLUME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOLUME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOLUME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2320,10 +2202,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WHITESPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WHITESPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WHITESPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2338,10 +2219,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WIDOWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDOWS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDOWS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2356,10 +2236,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2374,10 +2253,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WORDSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WORDSPACING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WORDSPACING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2392,10 +2270,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ZINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ZINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ZINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2410,10 +2287,9 @@ GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OPACITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -2461,10 +2337,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSS2PROPERTIES_AZIMUTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_AZIMUTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_AZIMUTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2475,10 +2350,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUND, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUND, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2489,10 +2363,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDATTACHMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDATTACHMENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDATTACHMENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2503,10 +2376,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2517,10 +2389,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDIMAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDIMAGE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDIMAGE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2531,10 +2402,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDPOSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDPOSITION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDPOSITION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2545,10 +2415,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BACKGROUNDREPEAT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDREPEAT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BACKGROUNDREPEAT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2559,10 +2428,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BEHAVIOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BEHAVIOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2573,10 +2441,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2587,10 +2454,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERCOLLAPSE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLLAPSE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLLAPSE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2601,10 +2467,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2615,10 +2480,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSPACING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSPACING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2629,10 +2493,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2643,10 +2506,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2657,10 +2519,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2671,10 +2532,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOM, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOM, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2685,10 +2545,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2699,10 +2558,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2713,10 +2571,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2727,10 +2584,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2741,10 +2597,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2755,10 +2610,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2769,10 +2623,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2783,10 +2636,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2797,10 +2649,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2811,10 +2662,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERTOPWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERTOPWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2825,10 +2675,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERRIGHTWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERRIGHTWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2839,10 +2688,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERBOTTOMWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERBOTTOMWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2853,10 +2701,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERLEFTWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERLEFTWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2867,10 +2714,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BORDERWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BORDERWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2881,10 +2727,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_BOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BOTTOM, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_BOTTOM, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2895,10 +2740,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CAPTIONSIDE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CAPTIONSIDE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CAPTIONSIDE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2909,10 +2753,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CLEAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLEAR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLEAR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2923,10 +2766,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CLIP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLIP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CLIP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2937,10 +2779,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2951,10 +2792,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CONTENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CONTENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CONTENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2965,10 +2805,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COUNTERINCREMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERINCREMENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERINCREMENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2979,10 +2818,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_COUNTERRESET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERRESET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_COUNTERRESET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -2993,10 +2831,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3007,10 +2844,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUEAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEAFTER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEAFTER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3021,10 +2857,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CUEBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEBEFORE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CUEBEFORE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3035,10 +2870,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CURSOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CURSOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CURSOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3049,10 +2883,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_DIRECTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DIRECTION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DIRECTION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3063,10 +2896,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_DISPLAY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DISPLAY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_DISPLAY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3077,10 +2909,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ELEVATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ELEVATION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ELEVATION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3091,10 +2922,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_EMPTYCELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_EMPTYCELLS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_EMPTYCELLS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3105,10 +2935,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_CSSFLOAT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CSSFLOAT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_CSSFLOAT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3119,10 +2948,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3133,10 +2961,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTFAMILY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTFAMILY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTFAMILY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3147,10 +2974,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3161,10 +2987,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSIZEADJUST: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZEADJUST, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSIZEADJUST, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3175,10 +3000,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSTRETCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTRETCH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTRETCH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3189,10 +3013,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3203,10 +3026,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTVARIANT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTVARIANT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTVARIANT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3217,10 +3039,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_FONTWEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTWEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_FONTWEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3231,10 +3052,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3245,10 +3065,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LEFT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LEFT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3259,10 +3078,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LETTERSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LETTERSPACING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LETTERSPACING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3273,10 +3091,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LINEHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LINEHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LINEHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3287,10 +3104,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3301,10 +3117,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLEIMAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEIMAGE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEIMAGE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3315,10 +3130,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLEPOSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEPOSITION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLEPOSITION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3329,10 +3143,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_LISTSTYLETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLETYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_LISTSTYLETYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3343,10 +3156,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGIN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGIN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGIN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3357,10 +3169,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINTOP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINTOP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3371,10 +3182,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINRIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINRIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3385,10 +3195,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINBOTTOM, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINBOTTOM, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3399,10 +3208,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARGINLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINLEFT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARGINLEFT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3413,10 +3221,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARKEROFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKEROFFSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKEROFFSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3427,10 +3234,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MARKS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MARKS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3441,10 +3247,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MAXHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3455,10 +3260,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MAXWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MAXWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3469,10 +3273,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3483,10 +3286,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_MINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_MINWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3497,10 +3299,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ORPHANS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ORPHANS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ORPHANS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3511,10 +3312,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3525,10 +3325,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINECOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINECOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINECOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3539,10 +3338,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINESTYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINESTYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINESTYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3553,10 +3351,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OUTLINEWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINEWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OUTLINEWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3567,10 +3364,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OVERFLOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OVERFLOW, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OVERFLOW, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3581,10 +3377,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3595,10 +3390,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGTOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGTOP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGTOP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3609,10 +3403,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGRIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGRIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGRIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3623,10 +3416,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGBOTTOM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGBOTTOM, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGBOTTOM, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3637,10 +3429,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PADDINGLEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGLEFT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PADDINGLEFT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3651,10 +3442,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3665,10 +3455,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKAFTER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKAFTER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3679,10 +3468,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKBEFORE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKBEFORE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3693,10 +3481,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAGEBREAKINSIDE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKINSIDE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAGEBREAKINSIDE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3707,10 +3494,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3721,10 +3507,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSEAFTER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEAFTER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEAFTER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3735,10 +3520,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PAUSEBEFORE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEBEFORE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PAUSEBEFORE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3749,10 +3533,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PITCH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3763,10 +3546,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PITCHRANGE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCHRANGE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PITCHRANGE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3777,10 +3559,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_PLAYDURING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PLAYDURING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_PLAYDURING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3791,10 +3572,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_POSITION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_POSITION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_POSITION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3805,10 +3585,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_QUOTES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_QUOTES, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_QUOTES, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3819,10 +3598,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_RICHNESS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RICHNESS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RICHNESS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3833,10 +3611,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_RIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_RIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3847,10 +3624,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3861,10 +3637,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAK, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAK, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3875,10 +3650,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKHEADER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKHEADER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKHEADER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3889,10 +3663,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKNUMERAL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKNUMERAL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKNUMERAL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3903,10 +3676,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEAKPUNCTUATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKPUNCTUATION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEAKPUNCTUATION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3917,10 +3689,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_SPEECHRATE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEECHRATE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_SPEECHRATE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3931,10 +3702,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_STRESS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_STRESS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_STRESS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3945,10 +3715,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TABLELAYOUT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TABLELAYOUT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TABLELAYOUT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3959,10 +3728,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3973,10 +3741,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTDECORATION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTDECORATION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTDECORATION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -3987,10 +3754,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTINDENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTINDENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTINDENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4001,10 +3767,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTSHADOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTSHADOW, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTSHADOW, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4015,10 +3780,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TEXTTRANSFORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTTRANSFORM, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TEXTTRANSFORM, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4029,10 +3793,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_TOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TOP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_TOP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4043,10 +3806,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_UNICODEBIDI: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_UNICODEBIDI, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_UNICODEBIDI, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4057,10 +3819,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VERTICALALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VERTICALALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VERTICALALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4071,10 +3832,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VISIBILITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VISIBILITY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VISIBILITY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4085,10 +3845,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VOICEFAMILY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOICEFAMILY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOICEFAMILY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4099,10 +3858,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_VOLUME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOLUME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_VOLUME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4113,10 +3871,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WHITESPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WHITESPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WHITESPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4127,10 +3884,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WIDOWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDOWS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDOWS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4141,10 +3897,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4155,10 +3910,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_WORDSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WORDSPACING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_WORDSPACING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4169,10 +3923,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_ZINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ZINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_ZINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4183,10 +3936,9 @@ SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSS2PROPERTIES_OPACITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSS2PROPERTIES_OPACITY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -4251,7 +4003,9 @@ JSClass CSS2PropertiesClass = { EnumerateCSS2Properties, ResolveCSS2Properties, JS_ConvertStub, - FinalizeCSS2Properties + FinalizeCSS2Properties, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp index be83117849f..ecb926994e2 100644 --- a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp @@ -75,10 +75,9 @@ GetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSFONTFACERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSFONTFACERULE_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSFONTFACERULE_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -127,10 +126,9 @@ SetCSSFontFaceRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSFONTFACERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSFONTFACERULE_STYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSFONTFACERULE_STYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -199,7 +197,9 @@ JSClass CSSFontFaceRuleClass = { EnumerateCSSFontFaceRule, ResolveCSSFontFaceRule, JS_ConvertStub, - FinalizeCSSFontFaceRule + FinalizeCSSFontFaceRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSImportRule.cpp b/mozilla/dom/src/css/nsJSCSSImportRule.cpp index d750fd82877..eeb68739273 100644 --- a/mozilla/dom/src/css/nsJSCSSImportRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSImportRule.cpp @@ -77,10 +77,9 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSIMPORTRULE_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -95,10 +94,9 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSIMPORTRULE_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_MEDIA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_MEDIA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -113,10 +111,9 @@ GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSIMPORTRULE_STYLESHEET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_STYLESHEET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_STYLESHEET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleSheet* prop; nsresult result = NS_OK; @@ -165,10 +162,9 @@ SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSIMPORTRULE_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_HREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_HREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -179,10 +175,9 @@ SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSIMPORTRULE_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_MEDIA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSIMPORTRULE_MEDIA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,7 +242,9 @@ JSClass CSSImportRuleClass = { EnumerateCSSImportRule, ResolveCSSImportRule, JS_ConvertStub, - FinalizeCSSImportRule + FinalizeCSSImportRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp index df7702f0075..f1e5a149101 100644 --- a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp @@ -76,10 +76,9 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSMEDIARULE_MEDIATYPES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_MEDIATYPES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_MEDIATYPES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSMEDIARULE_CSSRULES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_CSSRULES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_CSSRULES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleRuleCollection* prop; nsresult result = NS_OK; @@ -146,10 +144,9 @@ SetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSMEDIARULE_MEDIATYPES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_MEDIATYPES, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_MEDIATYPES, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -221,16 +218,14 @@ CSSMediaRuleInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_INSERTRULE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_INSERTRULE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -274,16 +269,14 @@ CSSMediaRuleDeleteRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_DELETERULE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSMEDIARULE_DELETERULE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -321,7 +314,9 @@ JSClass CSSMediaRuleClass = { EnumerateCSSMediaRule, ResolveCSSMediaRule, JS_ConvertStub, - FinalizeCSSMediaRule + FinalizeCSSMediaRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSPageRule.cpp b/mozilla/dom/src/css/nsJSCSSPageRule.cpp index fea3b11f4db..b46533a2654 100644 --- a/mozilla/dom/src/css/nsJSCSSPageRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSPageRule.cpp @@ -76,10 +76,9 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSPAGERULE_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSPAGERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -146,10 +144,9 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSPAGERULE_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -160,10 +157,9 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSPAGERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_STYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSPAGERULE_STYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -232,7 +228,9 @@ JSClass CSSPageRuleClass = { EnumerateCSSPageRule, ResolveCSSPageRule, JS_ConvertStub, - FinalizeCSSPageRule + FinalizeCSSPageRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSRule.cpp b/mozilla/dom/src/css/nsJSCSSRule.cpp index fd8cf3f270b..d26f12af066 100644 --- a/mozilla/dom/src/css/nsJSCSSRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSRule.cpp @@ -77,10 +77,9 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSRULE_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint16 prop; nsresult result = NS_OK; @@ -95,10 +94,9 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSRULE_CSSTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_CSSTEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_CSSTEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -113,10 +111,9 @@ GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSRULE_SHEET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_SHEET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_SHEET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleSheet* prop; nsresult result = NS_OK; @@ -165,10 +162,9 @@ SetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSRULE_CSSTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_CSSTEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSRULE_CSSTEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -233,7 +229,9 @@ JSClass CSSRuleClass = { EnumerateCSSRule, ResolveCSSRule, JS_ConvertStub, - FinalizeCSSRule + FinalizeCSSRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp index 6d530adc423..147907ea4fa 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp @@ -74,10 +74,9 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case CSSSTYLEDECLARATION_CSSTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_CSSTEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_CSSTEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case CSSSTYLEDECLARATION_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -153,10 +151,9 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case CSSSTYLEDECLARATION_CSSTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_CSSTEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_CSSTEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -227,16 +224,14 @@ CSSStyleDeclarationGetPropertyValue(JSContext *cx, JSObject *obj, uintN argc, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_GETPROPERTYVALUE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_GETPROPERTYVALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -278,16 +273,14 @@ CSSStyleDeclarationGetPropertyPriority(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_GETPROPERTYPRIORITY, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_GETPROPERTYPRIORITY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -330,16 +323,14 @@ CSSStyleDeclarationSetProperty(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_SETPROPERTY, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_SETPROPERTY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -383,16 +374,14 @@ CSSStyleDeclarationItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLEDECLARATION_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -430,7 +419,9 @@ JSClass CSSStyleDeclarationClass = { EnumerateCSSStyleDeclaration, ResolveCSSStyleDeclaration, JS_ConvertStub, - FinalizeCSSStyleDeclaration + FinalizeCSSStyleDeclaration, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp index 8f34d96a898..cc54d608c42 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp @@ -76,10 +76,9 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSSTYLERULE_SELECTORTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_SELECTORTEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_SELECTORTEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -146,10 +144,9 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSSTYLERULE_SELECTORTEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_SELECTORTEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_SELECTORTEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -160,10 +157,9 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLERULE_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_STYLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULE_STYLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -232,7 +228,9 @@ JSClass CSSStyleRuleClass = { EnumerateCSSStyleRule, ResolveCSSStyleRule, JS_ConvertStub, - FinalizeCSSStyleRule + FinalizeCSSStyleRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp index ced6e1c61bd..d35ec3f8370 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleRuleCollection.cpp @@ -75,10 +75,9 @@ GetCSSStyleRuleCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case CSSSTYLERULECOLLECTION_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULECOLLECTION_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULECOLLECTION_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -198,16 +197,14 @@ CSSStyleRuleCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULECOLLECTION_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLERULECOLLECTION_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -245,7 +242,9 @@ JSClass CSSStyleRuleCollectionClass = { EnumerateCSSStyleRuleCollection, ResolveCSSStyleRuleCollection, JS_ConvertStub, - FinalizeCSSStyleRuleCollection + FinalizeCSSStyleRuleCollection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp index 3edd83f11fc..fdb980949ac 100644 --- a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp +++ b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp @@ -84,10 +84,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case CSSSTYLESHEET_OWNINGNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_OWNINGNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_OWNINGNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -103,10 +102,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLESHEET_PARENTSTYLESHEET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_PARENTSTYLESHEET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_PARENTSTYLESHEET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMStyleSheet* prop; nsresult result = NS_OK; @@ -122,10 +120,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLESHEET_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -140,10 +137,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLESHEET_TITLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_TITLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_TITLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -158,10 +154,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLESHEET_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_MEDIA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_MEDIA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -176,10 +171,9 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case CSSSTYLESHEET_CSSRULES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_CSSRULES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_CSSRULES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleRuleCollection* prop; nsresult result = NS_OK; @@ -290,16 +284,14 @@ CSSStyleSheetInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_INSERTRULE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_INSERTRULE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -343,16 +335,14 @@ CSSStyleSheetDeleteRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_DELETERULE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSSTYLESHEET_DELETERULE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -390,7 +380,9 @@ JSClass CSSStyleSheetClass = { EnumerateCSSStyleSheet, ResolveCSSStyleSheet, JS_ConvertStub, - FinalizeCSSStyleSheet + FinalizeCSSStyleSheet, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp index 28cf23d5350..9e7fb8b320a 100644 --- a/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp +++ b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp @@ -156,7 +156,9 @@ JSClass CSSUnknownRuleClass = { EnumerateCSSUnknownRule, ResolveCSSUnknownRule, JS_ConvertStub, - FinalizeCSSUnknownRule + FinalizeCSSUnknownRule, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/events/nsJSEvent.cpp b/mozilla/dom/src/events/nsJSEvent.cpp index 5d786142dfc..4a6c4300959 100644 --- a/mozilla/dom/src/events/nsJSEvent.cpp +++ b/mozilla/dom/src/events/nsJSEvent.cpp @@ -80,10 +80,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case EVENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case EVENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -117,10 +115,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case EVENT_CURRENTNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_CURRENTNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_CURRENTNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -136,10 +133,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case EVENT_EVENTPHASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_EVENTPHASE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_EVENTPHASE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint16 prop; nsresult result = NS_OK; @@ -154,10 +150,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case EVENT_BUBBLES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_BUBBLES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_BUBBLES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -172,10 +167,9 @@ GetEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case EVENT_CANCELABLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_CANCELABLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_CANCELABLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -282,16 +276,14 @@ EventPreventBubble(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTBUBBLE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTBUBBLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -326,16 +318,14 @@ EventPreventCapture(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTCAPTURE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTCAPTURE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -370,16 +360,14 @@ EventPreventDefault(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTDEFAULT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_PREVENTDEFAULT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -417,16 +405,14 @@ EventInitEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_INITEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_EVENT_INITEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -468,7 +454,9 @@ JSClass EventClass = { EnumerateEvent, ResolveEvent, JS_ConvertStub, - FinalizeEvent + FinalizeEvent, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/events/nsJSKeyEvent.cpp b/mozilla/dom/src/events/nsJSKeyEvent.cpp index daca158637c..32942138be9 100644 --- a/mozilla/dom/src/events/nsJSKeyEvent.cpp +++ b/mozilla/dom/src/events/nsJSKeyEvent.cpp @@ -91,10 +91,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case KEYEVENT_CHARCODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_CHARCODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_CHARCODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -109,10 +108,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case KEYEVENT_KEYCODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_KEYCODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_KEYCODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -127,10 +125,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case KEYEVENT_ALTKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_ALTKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_ALTKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -145,10 +142,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case KEYEVENT_CTRLKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_CTRLKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_CTRLKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -163,10 +159,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case KEYEVENT_SHIFTKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_SHIFTKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_SHIFTKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -181,10 +176,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case KEYEVENT_METAKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_METAKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_METAKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -199,10 +193,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_SCREENX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_SCREENX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_SCREENX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMMouseEvent* b; @@ -225,10 +218,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_SCREENY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_SCREENY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_SCREENY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMMouseEvent* b; @@ -251,10 +243,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_CLIENTX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLIENTX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLIENTX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMMouseEvent* b; @@ -277,10 +268,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_CLIENTY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLIENTY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLIENTY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMMouseEvent* b; @@ -303,10 +293,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_BUTTON: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_BUTTON, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_BUTTON, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint16 prop; nsIDOMMouseEvent* b; @@ -329,10 +318,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_CLICKCOUNT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLICKCOUNT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_CLICKCOUNT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint16 prop; nsIDOMMouseEvent* b; @@ -355,10 +343,9 @@ GetKeyEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case MOUSEEVENT_RELATEDNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_RELATEDNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_RELATEDNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsIDOMMouseEvent* b; @@ -484,16 +471,14 @@ KeyEventInitKeyEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_INITKEYEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_KEYEVENT_INITKEYEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -580,16 +565,14 @@ MouseEventInitMouseEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_INITMOUSEEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_MOUSEEVENT_INITMOUSEEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -655,7 +638,9 @@ JSClass KeyEventClass = { EnumerateKeyEvent, ResolveKeyEvent, JS_ConvertStub, - FinalizeKeyEvent + FinalizeKeyEvent, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/events/nsJSUIEvent.cpp b/mozilla/dom/src/events/nsJSUIEvent.cpp index 9d031b5f3fe..4606fe5a32e 100644 --- a/mozilla/dom/src/events/nsJSUIEvent.cpp +++ b/mozilla/dom/src/events/nsJSUIEvent.cpp @@ -89,10 +89,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case UIEVENT_VIEW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_VIEW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_VIEW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMAbstractView* prop; nsresult result = NS_OK; @@ -108,10 +107,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case UIEVENT_DETAIL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_DETAIL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_DETAIL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -126,10 +124,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_LAYERX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_LAYERX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_LAYERX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSUIEvent* b; @@ -152,10 +149,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_LAYERY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_LAYERY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_LAYERY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSUIEvent* b; @@ -178,10 +174,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_PAGEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_PAGEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_PAGEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSUIEvent* b; @@ -204,10 +199,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_PAGEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_PAGEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_PAGEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSUIEvent* b; @@ -230,10 +224,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_WHICH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_WHICH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_WHICH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsIDOMNSUIEvent* b; @@ -256,10 +249,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_RANGEPARENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_RANGEPARENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_RANGEPARENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsIDOMNSUIEvent* b; @@ -283,10 +275,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_RANGEOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_RANGEOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_RANGEOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsIDOMNSUIEvent* b; @@ -309,10 +300,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_CANCELBUBBLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_CANCELBUBBLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_CANCELBUBBLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsIDOMNSUIEvent* b; @@ -335,10 +325,9 @@ GetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSUIEVENT_ISCHAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_ISCHAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_ISCHAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsIDOMNSUIEvent* b; @@ -394,10 +383,9 @@ SetUIEventProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case NSUIEVENT_CANCELBUBBLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_CANCELBUBBLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSUIEVENT_CANCELBUBBLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -481,16 +469,14 @@ UIEventInitUIEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_INITUIEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_UIEVENT_INITUIEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -542,7 +528,9 @@ JSClass UIEventClass = { EnumerateUIEvent, ResolveUIEvent, JS_ConvertStub, - FinalizeUIEvent + FinalizeUIEvent, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp index e9e46a96456..b5c50ab5a96 100644 --- a/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAnchorElement.cpp @@ -84,10 +84,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLANCHORELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -102,10 +101,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_CHARSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_CHARSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -120,10 +118,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_COORDS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_COORDS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_COORDS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -138,10 +135,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -156,10 +152,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_HREFLANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREFLANG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREFLANG, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -174,10 +169,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -192,10 +186,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_REL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -210,10 +203,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_REV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REV, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REV, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -228,10 +220,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_SHAPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_SHAPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_SHAPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -246,10 +237,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -264,10 +254,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -282,10 +271,9 @@ GetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -333,10 +321,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLANCHORELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -347,10 +334,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_CHARSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_CHARSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -361,10 +347,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_COORDS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_COORDS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_COORDS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -375,10 +360,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -389,10 +373,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_HREFLANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREFLANG, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_HREFLANG, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -403,10 +386,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -417,10 +399,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_REL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -431,10 +412,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_REV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REV, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_REV, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -445,10 +425,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_SHAPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_SHAPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_SHAPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -459,10 +438,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -479,10 +457,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TARGET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TARGET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -493,10 +470,9 @@ SetHTMLAnchorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLANCHORELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -565,16 +541,14 @@ HTMLAnchorElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -609,16 +583,14 @@ HTMLAnchorElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLANCHORELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -649,7 +621,9 @@ JSClass HTMLAnchorElementClass = { EnumerateHTMLAnchorElement, ResolveHTMLAnchorElement, JS_ConvertStub, - FinalizeHTMLAnchorElement + FinalizeHTMLAnchorElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp index 54228959493..dd6ab001ddf 100644 --- a/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAppletElement.cpp @@ -83,10 +83,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLAPPLETELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -101,10 +100,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -119,10 +117,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_ARCHIVE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ARCHIVE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ARCHIVE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -137,10 +134,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_CODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -155,10 +151,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_CODEBASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODEBASE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODEBASE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -173,10 +168,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -191,10 +185,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -209,10 +202,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -227,10 +219,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_OBJECT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_OBJECT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_OBJECT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -245,10 +236,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_VSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_VSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -263,10 +253,9 @@ GetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -314,10 +303,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLAPPLETELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -328,10 +316,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ALT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -342,10 +329,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_ARCHIVE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ARCHIVE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_ARCHIVE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -356,10 +342,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_CODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -370,10 +355,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_CODEBASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODEBASE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_CODEBASE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -384,10 +368,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -398,10 +381,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_HSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -412,10 +394,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -426,10 +407,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_OBJECT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_OBJECT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_OBJECT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -440,10 +420,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_VSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_VSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -454,10 +433,9 @@ SetHTMLAppletElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAPPLETELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAPPLETELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -522,7 +500,9 @@ JSClass HTMLAppletElementClass = { EnumerateHTMLAppletElement, ResolveHTMLAppletElement, JS_ConvertStub, - FinalizeHTMLAppletElement + FinalizeHTMLAppletElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp index 9ef2872615a..3feeb0886a4 100644 --- a/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLAreaElement.cpp @@ -80,10 +80,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLAREAELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ALT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ALT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -116,10 +114,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_COORDS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_COORDS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_COORDS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -134,10 +131,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -152,10 +148,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_NOHREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_NOHREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_NOHREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -170,10 +165,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_SHAPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_SHAPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_SHAPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -188,10 +182,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -206,10 +199,9 @@ GetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -257,10 +249,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLAREAELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -271,10 +262,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ALT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_ALT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -285,10 +275,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_COORDS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_COORDS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_COORDS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -299,10 +288,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_HREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_HREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -313,10 +301,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_NOHREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_NOHREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_NOHREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -329,10 +316,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_SHAPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_SHAPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_SHAPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -343,10 +329,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -363,10 +348,9 @@ SetHTMLAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLAREAELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TARGET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLAREAELEMENT_TARGET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -431,7 +415,9 @@ JSClass HTMLAreaElementClass = { EnumerateHTMLAreaElement, ResolveHTMLAreaElement, JS_ConvertStub, - FinalizeHTMLAreaElement + FinalizeHTMLAreaElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp index b83cc81f88d..9ea3f21e6c3 100644 --- a/mozilla/dom/src/html/nsJSHTMLBRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBRElement.cpp @@ -73,10 +73,9 @@ GetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBRELEMENT_CLEAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBRELEMENT_CLEAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBRELEMENT_CLEAR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLBRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBRELEMENT_CLEAR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBRELEMENT_CLEAR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBRELEMENT_CLEAR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLBRElementClass = { EnumerateHTMLBRElement, ResolveHTMLBRElement, JS_ConvertStub, - FinalizeHTMLBRElement + FinalizeHTMLBRElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp index e517a2ca7c3..4c2dc268792 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseElement.cpp @@ -74,10 +74,9 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBASEELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBASEELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBASEELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_HREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_HREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -157,10 +154,9 @@ SetHTMLBaseElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBASEELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_TARGET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEELEMENT_TARGET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -225,7 +221,9 @@ JSClass HTMLBaseElementClass = { EnumerateHTMLBaseElement, ResolveHTMLBaseElement, JS_ConvertStub, - FinalizeHTMLBaseElement + FinalizeHTMLBaseElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp index 47f5108d176..c3a75b3741e 100644 --- a/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBaseFontElement.cpp @@ -75,10 +75,9 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLBASEFONTELEMENT_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_COLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_COLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLBASEFONTELEMENT_FACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_FACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_FACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLBASEFONTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLBASEFONTELEMENT_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_COLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_COLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -176,10 +172,9 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLBASEFONTELEMENT_FACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_FACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_FACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -190,10 +185,9 @@ SetHTMLBaseFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLBASEFONTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBASEFONTELEMENT_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -258,7 +252,9 @@ JSClass HTMLBaseFontElementClass = { EnumerateHTMLBaseFontElement, ResolveHTMLBaseFontElement, JS_ConvertStub, - FinalizeHTMLBaseFontElement + FinalizeHTMLBaseFontElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp index e3da2b22446..c861f063809 100644 --- a/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLBodyElement.cpp @@ -78,10 +78,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBODYELEMENT_ALINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_ALINK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_ALINK, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -96,10 +95,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BACKGROUND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BACKGROUND, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -114,10 +112,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -132,10 +129,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_LINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_LINK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_LINK, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -150,10 +146,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_TEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_TEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -168,10 +163,9 @@ GetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_VLINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_VLINK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_VLINK, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -219,10 +213,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBODYELEMENT_ALINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_ALINK, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_ALINK, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -233,10 +226,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BACKGROUND, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BACKGROUND, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,10 +239,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -261,10 +252,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_LINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_LINK, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_LINK, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -275,10 +265,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_TEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_TEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -289,10 +278,9 @@ SetHTMLBodyElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBODYELEMENT_VLINK: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_VLINK, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBODYELEMENT_VLINK, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -357,7 +345,9 @@ JSClass HTMLBodyElementClass = { EnumerateHTMLBodyElement, ResolveHTMLBodyElement, JS_ConvertStub, - FinalizeHTMLBodyElement + FinalizeHTMLBodyElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp index 41754369d6e..97d2cea2db0 100644 --- a/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLButtonElement.cpp @@ -83,10 +83,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBUTTONELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -102,10 +101,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -120,10 +118,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -138,10 +135,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -156,10 +152,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -174,10 +169,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -192,10 +186,9 @@ GetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -243,10 +236,9 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLBUTTONELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -257,10 +249,9 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -273,10 +264,9 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -287,10 +277,9 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -307,10 +296,9 @@ SetHTMLButtonElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLBUTTONELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLBUTTONELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -384,16 +372,14 @@ NSHTMLButtonElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLBUTTONELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLBUTTONELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -433,16 +419,14 @@ NSHTMLButtonElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLBUTTONELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLBUTTONELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -473,7 +457,9 @@ JSClass HTMLButtonElementClass = { EnumerateHTMLButtonElement, ResolveHTMLButtonElement, JS_ConvertStub, - FinalizeHTMLButtonElement + FinalizeHTMLButtonElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLCollection.cpp b/mozilla/dom/src/html/nsJSHTMLCollection.cpp index cdf991a2935..6be522dd637 100644 --- a/mozilla/dom/src/html/nsJSHTMLCollection.cpp +++ b/mozilla/dom/src/html/nsJSHTMLCollection.cpp @@ -77,10 +77,9 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLCOLLECTION_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -230,16 +229,14 @@ HTMLCollectionItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -283,16 +280,14 @@ HTMLCollectionNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLCOLLECTION_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -328,7 +323,9 @@ JSClass HTMLCollectionClass = { EnumerateHTMLCollection, ResolveHTMLCollection, JS_ConvertStub, - FinalizeHTMLCollection + FinalizeHTMLCollection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp index 76ef3da5208..1d615507ab8 100644 --- a/mozilla/dom/src/html/nsJSHTMLDListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDListElement.cpp @@ -73,10 +73,9 @@ GetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDLISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDLISTELEMENT_COMPACT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDLISTELEMENT_COMPACT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLDListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDLISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDLISTELEMENT_COMPACT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDLISTELEMENT_COMPACT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -194,7 +192,9 @@ JSClass HTMLDListElementClass = { EnumerateHTMLDListElement, ResolveHTMLDListElement, JS_ConvertStub, - FinalizeHTMLDListElement + FinalizeHTMLDListElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp index 689bf293bca..d9ea49d280d 100644 --- a/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDirectoryElement.cpp @@ -73,10 +73,9 @@ GetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLDIRECTORYELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIRECTORYELEMENT_COMPACT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIRECTORYELEMENT_COMPACT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLDirectoryElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLDIRECTORYELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIRECTORYELEMENT_COMPACT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIRECTORYELEMENT_COMPACT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -194,7 +192,9 @@ JSClass HTMLDirectoryElementClass = { EnumerateHTMLDirectoryElement, ResolveHTMLDirectoryElement, JS_ConvertStub, - FinalizeHTMLDirectoryElement + FinalizeHTMLDirectoryElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp index 0fb33942130..cad9d008be9 100644 --- a/mozilla/dom/src/html/nsJSHTMLDivElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDivElement.cpp @@ -73,10 +73,9 @@ GetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDIVELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIVELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIVELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLDivElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDIVELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIVELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDIVELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLDivElementClass = { EnumerateHTMLDivElement, ResolveHTMLDivElement, JS_ConvertStub, - FinalizeHTMLDivElement + FinalizeHTMLDivElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp index e7d6d5b72ea..914c0c9173f 100644 --- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp @@ -105,10 +105,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDOCUMENT_TITLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_TITLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_TITLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -123,10 +122,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_REFERRER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_REFERRER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_REFERRER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -141,10 +139,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_DOMAIN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_DOMAIN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_DOMAIN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -159,10 +156,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_URL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_URL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_URL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -177,10 +173,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_BODY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_BODY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_BODY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLElement* prop; nsresult result = NS_OK; @@ -196,10 +191,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_IMAGES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_IMAGES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_IMAGES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -215,10 +209,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_APPLETS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_APPLETS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_APPLETS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -234,10 +227,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_LINKS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_LINKS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_LINKS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -253,10 +245,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_FORMS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_FORMS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_FORMS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -272,10 +263,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_ANCHORS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_ANCHORS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_ANCHORS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -291,10 +281,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_COOKIE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_COOKIE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_COOKIE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -309,10 +298,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_ALINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ALINKCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ALINKCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -335,10 +323,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_LINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LINKCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LINKCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -361,10 +348,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_VLINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_VLINKCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_VLINKCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -387,10 +373,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -413,10 +398,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_FGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_FGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_FGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -439,10 +423,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_LASTMODIFIED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LASTMODIFIED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LASTMODIFIED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLDocument* b; @@ -465,10 +448,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_EMBEDS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_EMBEDS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_EMBEDS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsIDOMNSHTMLDocument* b; @@ -492,10 +474,9 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_PLUGINS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_PLUGINS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_PLUGINS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsIDOMNSHTMLDocument* b; @@ -590,10 +571,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLDOCUMENT_TITLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_TITLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_TITLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -604,10 +584,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_DOMAIN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_DOMAIN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_DOMAIN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -618,10 +597,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_BODY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_BODY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_BODY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -636,10 +614,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLDOCUMENT_COOKIE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_COOKIE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_COOKIE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -650,10 +627,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_ALINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ALINKCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ALINKCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -672,10 +648,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_LINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LINKCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_LINKCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -694,10 +669,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_VLINKCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_VLINKCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_VLINKCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -716,10 +690,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -738,10 +711,9 @@ SetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLDOCUMENT_FGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_FGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_FGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -818,16 +790,14 @@ HTMLDocumentClose(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_CLOSE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_CLOSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -864,16 +834,14 @@ HTMLDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_GETELEMENTBYID, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_GETELEMENTBYID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -915,16 +883,14 @@ HTMLDocumentGetElementsByName(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_GETELEMENTSBYNAME, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLDOCUMENT_GETELEMENTSBYNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -970,16 +936,14 @@ NSHTMLDocumentGetSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_GETSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_GETSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1021,16 +985,14 @@ NSHTMLDocumentNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1075,16 +1037,14 @@ NSHTMLDocumentOpen(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_OPEN, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_OPEN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1124,16 +1084,14 @@ NSHTMLDocumentWrite(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_WRITE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_WRITE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1173,16 +1131,14 @@ NSHTMLDocumentWriteln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_WRITELN, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_WRITELN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1222,16 +1178,14 @@ NSHTMLDocumentClear(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_CLEAR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_CLEAR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1272,16 +1226,14 @@ NSHTMLDocumentCaptureEvents(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_CAPTUREEVENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_CAPTUREEVENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1329,16 +1281,14 @@ NSHTMLDocumentReleaseEvents(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_RELEASEEVENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_RELEASEEVENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1386,16 +1336,14 @@ NSHTMLDocumentRouteEvent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ROUTEEVENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLDOCUMENT_ROUTEEVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1437,7 +1385,9 @@ JSClass HTMLDocumentClass = { EnumerateHTMLDocument, ResolveHTMLDocument, JS_ConvertStub, - FinalizeHTMLDocument + FinalizeHTMLDocument, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLElement.cpp b/mozilla/dom/src/html/nsJSHTMLElement.cpp index 6562ade92a3..00b6dacfb33 100644 --- a/mozilla/dom/src/html/nsJSHTMLElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLElement.cpp @@ -80,10 +80,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_ID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_ID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_TITLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_TITLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_TITLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -116,10 +114,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_LANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_LANG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_LANG, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -134,10 +131,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_DIR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_DIR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_DIR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -152,10 +148,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_CLASSNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_CLASSNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -170,10 +165,9 @@ GetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -222,10 +216,9 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_ID, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_ID, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -236,10 +229,9 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_TITLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_TITLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_TITLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -250,10 +242,9 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_LANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_LANG, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_LANG, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -264,10 +255,9 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_DIR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_DIR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_DIR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -278,10 +268,9 @@ SetHTMLElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_CLASSNAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLELEMENT_CLASSNAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -346,7 +335,9 @@ JSClass HTMLElementClass = { EnumerateHTMLElement, ResolveHTMLElement, JS_ConvertStub, - FinalizeHTMLElement + FinalizeHTMLElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLEmbedElement.cpp b/mozilla/dom/src/html/nsJSHTMLEmbedElement.cpp index d9f1065fe3d..7dcb94a4b43 100644 --- a/mozilla/dom/src/html/nsJSHTMLEmbedElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLEmbedElement.cpp @@ -84,10 +84,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLEMBEDELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -102,10 +101,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -120,10 +118,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -138,10 +135,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_SRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_SRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -156,10 +152,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -174,10 +169,9 @@ GetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -225,10 +219,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLEMBEDELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -239,10 +232,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -253,10 +245,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -267,10 +258,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_SRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_SRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -281,10 +271,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -295,10 +284,9 @@ SetHTMLEmbedElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLEMBEDELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLEMBEDELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -363,7 +351,9 @@ JSClass HTMLEmbedElementClass = { EnumerateHTMLEmbedElement, ResolveHTMLEmbedElement, JS_ConvertStub, - FinalizeHTMLEmbedElement + FinalizeHTMLEmbedElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp index d1522901899..03a392d469f 100644 --- a/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFieldSetElement.cpp @@ -75,10 +75,9 @@ GetHTMLFieldSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLFIELDSETELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFIELDSETELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFIELDSETELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -182,7 +181,9 @@ JSClass HTMLFieldSetElementClass = { EnumerateHTMLFieldSetElement, ResolveHTMLFieldSetElement, JS_ConvertStub, - FinalizeHTMLFieldSetElement + FinalizeHTMLFieldSetElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp index 23962d0a920..fdac7cdb661 100644 --- a/mozilla/dom/src/html/nsJSHTMLFontElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFontElement.cpp @@ -75,10 +75,9 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFONTELEMENT_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_COLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_COLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFONTELEMENT_FACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_FACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_FACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFONTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFONTELEMENT_COLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_COLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_COLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -176,10 +172,9 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFONTELEMENT_FACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_FACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_FACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -190,10 +185,9 @@ SetHTMLFontElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFONTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFONTELEMENT_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -258,7 +252,9 @@ JSClass HTMLFontElementClass = { EnumerateHTMLFontElement, ResolveHTMLFontElement, JS_ConvertStub, - FinalizeHTMLFontElement + FinalizeHTMLFontElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFormControlList.cpp b/mozilla/dom/src/html/nsJSHTMLFormControlList.cpp index 73e8ec65b13..4f5f5718fdf 100644 --- a/mozilla/dom/src/html/nsJSHTMLFormControlList.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFormControlList.cpp @@ -178,16 +178,14 @@ HTMLFormControlListNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *ar *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMCONTROLLIST_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMCONTROLLIST_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -223,16 +221,14 @@ HTMLFormControlListItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMCONTROLLIST_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMCONTROLLIST_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -263,7 +259,9 @@ JSClass HTMLFormControlListClass = { EnumerateHTMLFormControlList, ResolveHTMLFormControlList, JS_ConvertStub, - FinalizeHTMLFormControlList + FinalizeHTMLFormControlList, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp index e824c051812..8604e558794 100644 --- a/mozilla/dom/src/html/nsJSHTMLFormElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFormElement.cpp @@ -89,10 +89,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFORMELEMENT_ELEMENTS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ELEMENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ELEMENTS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -108,10 +107,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -126,10 +124,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -144,10 +141,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ACCEPTCHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACCEPTCHARSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACCEPTCHARSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +158,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ACTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACTION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -180,10 +175,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ENCTYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ENCTYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ENCTYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -198,10 +192,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_METHOD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_METHOD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_METHOD, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -216,10 +209,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -234,10 +226,9 @@ GetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLFORMELEMENT_ENCODING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_ENCODING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_ENCODING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMNSHTMLFormElement* b; @@ -329,10 +320,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFORMELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -343,10 +333,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ACCEPTCHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACCEPTCHARSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACCEPTCHARSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -357,10 +346,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ACTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACTION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ACTION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -371,10 +359,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_ENCTYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ENCTYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_ENCTYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -385,10 +372,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_METHOD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_METHOD, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_METHOD, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -399,10 +385,9 @@ SetHTMLFormElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFORMELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_TARGET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_TARGET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -471,16 +456,14 @@ HTMLFormElementSubmit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_SUBMIT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_SUBMIT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -515,16 +498,14 @@ HTMLFormElementReset(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_RESET, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFORMELEMENT_RESET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -565,16 +546,14 @@ NSHTMLFormElementNamedItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_NAMEDITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_NAMEDITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -616,16 +595,14 @@ NSHTMLFormElementItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLFORMELEMENT_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -663,7 +640,9 @@ JSClass HTMLFormElementClass = { EnumerateHTMLFormElement, ResolveHTMLFormElement, JS_ConvertStub, - FinalizeHTMLFormElement + FinalizeHTMLFormElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp index b06c2fcfba0..f471c23b32c 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameElement.cpp @@ -80,10 +80,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFRAMEELEMENT_FRAMEBORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_FRAMEBORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_FRAMEBORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -98,10 +97,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_LONGDESC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_LONGDESC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -116,10 +114,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_MARGINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -134,10 +131,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_MARGINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -152,10 +148,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -170,10 +165,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_NORESIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NORESIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NORESIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -188,10 +182,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_SCROLLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SCROLLING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SCROLLING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -206,10 +199,9 @@ GetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -257,10 +249,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLFRAMEELEMENT_FRAMEBORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_FRAMEBORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_FRAMEBORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -271,10 +262,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_LONGDESC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_LONGDESC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -285,10 +275,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_MARGINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -299,10 +288,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_MARGINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_MARGINWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -313,10 +301,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -327,10 +314,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_NORESIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NORESIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_NORESIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -343,10 +329,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_SCROLLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SCROLLING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SCROLLING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -357,10 +342,9 @@ SetHTMLFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLFRAMEELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMEELEMENT_SRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -425,7 +409,9 @@ JSClass HTMLFrameElementClass = { EnumerateHTMLFrameElement, ResolveHTMLFrameElement, JS_ConvertStub, - FinalizeHTMLFrameElement + FinalizeHTMLFrameElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp index bad6505da05..2f6806fbd6c 100644 --- a/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLFrameSetElement.cpp @@ -74,10 +74,9 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLFRAMESETELEMENT_COLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_COLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_COLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLFRAMESETELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_ROWS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_ROWS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLFRAMESETELEMENT_COLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_COLS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_COLS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -157,10 +154,9 @@ SetHTMLFrameSetElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLFRAMESETELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_ROWS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLFRAMESETELEMENT_ROWS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -225,7 +221,9 @@ JSClass HTMLFrameSetElementClass = { EnumerateHTMLFrameSetElement, ResolveHTMLFrameSetElement, JS_ConvertStub, - FinalizeHTMLFrameSetElement + FinalizeHTMLFrameSetElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp index 3968f347a16..a34fd1679d1 100644 --- a/mozilla/dom/src/html/nsJSHTMLHRElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHRElement.cpp @@ -76,10 +76,9 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHRELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_NOSHADE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_NOSHADE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_NOSHADE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -112,10 +110,9 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -130,10 +127,9 @@ GetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -181,10 +177,9 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHRELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -195,10 +190,9 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_NOSHADE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_NOSHADE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_NOSHADE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -211,10 +205,9 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -225,10 +218,9 @@ SetHTMLHRElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLHRELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHRELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -293,7 +285,9 @@ JSClass HTMLHRElementClass = { EnumerateHTMLHRElement, ResolveHTMLHRElement, JS_ConvertStub, - FinalizeHTMLHRElement + FinalizeHTMLHRElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp index d8469cb063d..9b895252742 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadElement.cpp @@ -73,10 +73,9 @@ GetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHEADELEMENT_PROFILE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADELEMENT_PROFILE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADELEMENT_PROFILE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLHeadElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHEADELEMENT_PROFILE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADELEMENT_PROFILE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADELEMENT_PROFILE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLHeadElementClass = { EnumerateHTMLHeadElement, ResolveHTMLHeadElement, JS_ConvertStub, - FinalizeHTMLHeadElement + FinalizeHTMLHeadElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp index 599374f0446..1e84e77d2c5 100644 --- a/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHeadingElement.cpp @@ -73,10 +73,9 @@ GetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHEADINGELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADINGELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADINGELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLHeadingElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHEADINGELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADINGELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHEADINGELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLHeadingElementClass = { EnumerateHTMLHeadingElement, ResolveHTMLHeadingElement, JS_ConvertStub, - FinalizeHTMLHeadingElement + FinalizeHTMLHeadingElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp index 94be4226995..742bf16d6e3 100644 --- a/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLHtmlElement.cpp @@ -73,10 +73,9 @@ GetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHTMLELEMENT_VERSION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHTMLELEMENT_VERSION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHTMLELEMENT_VERSION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLHtmlElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLHTMLELEMENT_VERSION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHTMLELEMENT_VERSION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLHTMLELEMENT_VERSION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLHtmlElementClass = { EnumerateHTMLHtmlElement, ResolveHTMLHtmlElement, JS_ConvertStub, - FinalizeHTMLHtmlElement + FinalizeHTMLHtmlElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp index 3020693c243..fbe56a456cf 100644 --- a/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIFrameElement.cpp @@ -82,10 +82,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLIFRAMEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -100,10 +99,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_FRAMEBORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_FRAMEBORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_FRAMEBORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -118,10 +116,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -136,10 +133,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_LONGDESC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_LONGDESC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -154,10 +150,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_MARGINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINHEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINHEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -172,10 +167,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_MARGINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINWIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINWIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -190,10 +184,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -208,10 +201,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_SCROLLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SCROLLING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SCROLLING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -226,10 +218,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -244,10 +235,9 @@ GetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -295,10 +285,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLIFRAMEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -309,10 +298,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_FRAMEBORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_FRAMEBORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_FRAMEBORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -323,10 +311,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -337,10 +324,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_LONGDESC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_LONGDESC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -351,10 +337,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_MARGINHEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINHEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINHEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -365,10 +350,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_MARGINWIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINWIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_MARGINWIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -379,10 +363,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -393,10 +376,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_SCROLLING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SCROLLING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SCROLLING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -407,10 +389,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_SRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -421,10 +402,9 @@ SetHTMLIFrameElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIFRAMEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIFRAMEELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -489,7 +469,9 @@ JSClass HTMLIFrameElementClass = { EnumerateHTMLIFrameElement, ResolveHTMLIFrameElement, JS_ConvertStub, - FinalizeHTMLIFrameElement + FinalizeHTMLIFrameElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp index 01cc485d1d9..2a9de39cb1b 100644 --- a/mozilla/dom/src/html/nsJSHTMLImageElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLImageElement.cpp @@ -92,10 +92,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLIMAGEELEMENT_LOWSRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LOWSRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LOWSRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -110,10 +109,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -128,10 +126,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -146,10 +143,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -164,10 +160,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_BORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_BORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -182,10 +177,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -200,10 +194,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -218,10 +211,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ISMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ISMAP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ISMAP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -236,10 +228,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LONGDESC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LONGDESC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -254,10 +245,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_USEMAP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_USEMAP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -272,10 +262,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_VSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_VSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -290,10 +279,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -308,10 +296,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case IMAGE_LOWSRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_LOWSRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_LOWSRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsIDOMImage* b; @@ -334,10 +321,9 @@ GetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case IMAGE_COMPLETE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_COMPLETE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_COMPLETE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsIDOMImage* b; @@ -393,10 +379,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLIMAGEELEMENT_LOWSRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LOWSRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LOWSRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -407,10 +392,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -421,10 +405,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -435,10 +418,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ALT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -449,10 +431,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_BORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_BORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -463,10 +444,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -477,10 +457,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_HSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -491,10 +470,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_ISMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ISMAP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_ISMAP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -507,10 +485,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_LONGDESC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LONGDESC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_LONGDESC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -521,10 +498,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_USEMAP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_USEMAP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -535,10 +511,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_VSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_VSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -549,10 +524,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLIMAGEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLIMAGEELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -563,10 +537,9 @@ SetHTMLImageElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case IMAGE_LOWSRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_LOWSRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_IMAGE_LOWSRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -639,7 +612,9 @@ JSClass HTMLImageElementClass = { EnumerateHTMLImageElement, ResolveHTMLImageElement, JS_ConvertStub, - FinalizeHTMLImageElement + FinalizeHTMLImageElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp index df8cdac344a..8d01892ee85 100644 --- a/mozilla/dom/src/html/nsJSHTMLInputElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLInputElement.cpp @@ -98,10 +98,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLINPUTELEMENT_DEFAULTVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTVALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTVALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -116,10 +115,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_DEFAULTCHECKED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTCHECKED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTCHECKED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -134,10 +132,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -153,10 +150,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ACCEPT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCEPT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCEPT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -171,10 +167,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -189,10 +184,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -207,10 +201,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -225,10 +218,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_CHECKED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CHECKED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CHECKED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -243,10 +235,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -261,10 +252,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_MAXLENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_MAXLENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_MAXLENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -279,10 +269,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -297,10 +286,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_READONLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_READONLY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_READONLY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -315,10 +303,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -333,10 +320,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -351,10 +337,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -369,10 +354,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -387,10 +371,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_USEMAP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_USEMAP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -405,10 +388,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -423,10 +405,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_AUTOCOMPLETE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_AUTOCOMPLETE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_AUTOCOMPLETE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -441,10 +422,9 @@ GetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case NSHTMLINPUTELEMENT_CONTROLLERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLINPUTELEMENT_CONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLINPUTELEMENT_CONTROLLERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIControllers* prop; nsIDOMNSHTMLInputElement* b; @@ -501,10 +481,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLINPUTELEMENT_DEFAULTVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTVALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTVALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -515,10 +494,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_DEFAULTCHECKED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTCHECKED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DEFAULTCHECKED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -531,10 +509,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ACCEPT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCEPT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCEPT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -545,10 +522,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -559,10 +535,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -573,10 +548,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_ALT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_ALT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -587,10 +561,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_CHECKED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CHECKED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CHECKED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -603,10 +576,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -619,10 +591,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_MAXLENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_MAXLENGTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_MAXLENGTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -639,10 +610,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -653,10 +623,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_READONLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_READONLY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_READONLY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -669,10 +638,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -683,10 +651,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -697,10 +664,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -717,10 +683,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_USEMAP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_USEMAP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -731,10 +696,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -745,10 +709,9 @@ SetHTMLInputElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLINPUTELEMENT_AUTOCOMPLETE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_AUTOCOMPLETE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_AUTOCOMPLETE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -817,16 +780,14 @@ HTMLInputElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -861,16 +822,14 @@ HTMLInputElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -905,16 +864,14 @@ HTMLInputElementSelect(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SELECT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_SELECT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -949,16 +906,14 @@ HTMLInputElementClick(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CLICK, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLINPUTELEMENT_CLICK, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -989,7 +944,9 @@ JSClass HTMLInputElementClass = { EnumerateHTMLInputElement, ResolveHTMLInputElement, JS_ConvertStub, - FinalizeHTMLInputElement + FinalizeHTMLInputElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp index 80d19b343a2..d5b5d01d431 100644 --- a/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLIsIndexElement.cpp @@ -76,10 +76,9 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLISINDEXELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -95,10 +94,9 @@ GetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLISINDEXELEMENT_PROMPT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_PROMPT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_PROMPT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -146,10 +144,9 @@ SetHTMLIsIndexElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLISINDEXELEMENT_PROMPT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_PROMPT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLISINDEXELEMENT_PROMPT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -214,7 +211,9 @@ JSClass HTMLIsIndexElementClass = { EnumerateHTMLIsIndexElement, ResolveHTMLIsIndexElement, JS_ConvertStub, - FinalizeHTMLIsIndexElement + FinalizeHTMLIsIndexElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp index cffd0f43cbf..4a0ad6a3f38 100644 --- a/mozilla/dom/src/html/nsJSHTMLLIElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLIElement.cpp @@ -74,10 +74,9 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLIELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLIELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLIELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -157,10 +154,9 @@ SetHTMLLIElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLIELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLIELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -231,7 +227,9 @@ JSClass HTMLLIElementClass = { EnumerateHTMLLIElement, ResolveHTMLLIElement, JS_ConvertStub, - FinalizeHTMLLIElement + FinalizeHTMLLIElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp index 9854de74efb..fedfe97f97f 100644 --- a/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLabelElement.cpp @@ -77,10 +77,9 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLABELELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -96,10 +95,9 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLABELELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -114,10 +112,9 @@ GetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLABELELEMENT_HTMLFOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_HTMLFOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_HTMLFOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -165,10 +162,9 @@ SetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLABELELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -179,10 +175,9 @@ SetHTMLLabelElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLABELELEMENT_HTMLFOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_HTMLFOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLABELELEMENT_HTMLFOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,7 +242,9 @@ JSClass HTMLLabelElementClass = { EnumerateHTMLLabelElement, ResolveHTMLLabelElement, JS_ConvertStub, - FinalizeHTMLLabelElement + FinalizeHTMLLabelElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp b/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp index a9bf1e013ff..c7ca171d2cb 100644 --- a/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLayerElement.cpp @@ -82,10 +82,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLAYERELEMENT_TOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_TOP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_TOP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -100,10 +99,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_LEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_LEFT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_LEFT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -118,10 +116,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_VISIBILITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_VISIBILITY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_VISIBILITY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -136,10 +133,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BACKGROUND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BACKGROUND, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -154,10 +150,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -172,10 +167,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -190,10 +184,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_ZINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_ZINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_ZINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -208,10 +201,9 @@ GetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_DOCUMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_DOCUMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_DOCUMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMDocument* prop; nsresult result = NS_OK; @@ -260,10 +252,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLAYERELEMENT_TOP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_TOP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_TOP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -280,10 +271,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_LEFT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_LEFT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_LEFT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -300,10 +290,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_VISIBILITY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_VISIBILITY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_VISIBILITY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -314,10 +303,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_BACKGROUND: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BACKGROUND, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BACKGROUND, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -328,10 +316,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -342,10 +329,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -356,10 +342,9 @@ SetHTMLLayerElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLAYERELEMENT_ZINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_ZINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLAYERELEMENT_ZINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -430,7 +415,9 @@ JSClass HTMLLayerElementClass = { EnumerateHTMLLayerElement, ResolveHTMLLayerElement, JS_ConvertStub, - FinalizeHTMLLayerElement + FinalizeHTMLLayerElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp index abaa9d40b82..d47f2611e1e 100644 --- a/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLegendElement.cpp @@ -77,10 +77,9 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLEGENDELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -96,10 +95,9 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLEGENDELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -114,10 +112,9 @@ GetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLEGENDELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -165,10 +162,9 @@ SetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLEGENDELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -179,10 +175,9 @@ SetHTMLLegendElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLEGENDELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLEGENDELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,7 +242,9 @@ JSClass HTMLLegendElementClass = { EnumerateHTMLLegendElement, ResolveHTMLLegendElement, JS_ConvertStub, - FinalizeHTMLLegendElement + FinalizeHTMLLegendElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp b/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp index ca176129c67..89346948370 100644 --- a/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLLinkElement.cpp @@ -81,10 +81,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLINKELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -99,10 +98,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_CHARSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_CHARSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -117,10 +115,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -135,10 +132,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_HREFLANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREFLANG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREFLANG, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -153,10 +149,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_MEDIA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_MEDIA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -171,10 +166,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_REL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -189,10 +183,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_REV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REV, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REV, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -207,10 +200,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TARGET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TARGET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -225,10 +217,9 @@ GetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -276,10 +267,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLLINKELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -292,10 +282,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_CHARSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_CHARSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -306,10 +295,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_HREF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -320,10 +308,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_HREFLANG: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREFLANG, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_HREFLANG, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -334,10 +321,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_MEDIA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_MEDIA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -348,10 +334,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_REL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -362,10 +347,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_REV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REV, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_REV, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -376,10 +360,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_TARGET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TARGET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TARGET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -390,10 +373,9 @@ SetHTMLLinkElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLLINKELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLLINKELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -458,7 +440,9 @@ JSClass HTMLLinkElementClass = { EnumerateHTMLLinkElement, ResolveHTMLLinkElement, JS_ConvertStub, - FinalizeHTMLLinkElement + FinalizeHTMLLinkElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp index f9b653194ae..0084ac2533b 100644 --- a/mozilla/dom/src/html/nsJSHTMLMapElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMapElement.cpp @@ -76,10 +76,9 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMAPELEMENT_AREAS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_AREAS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_AREAS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -95,10 +94,9 @@ GetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMAPELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -146,10 +144,9 @@ SetHTMLMapElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMAPELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMAPELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -214,7 +211,9 @@ JSClass HTMLMapElementClass = { EnumerateHTMLMapElement, ResolveHTMLMapElement, JS_ConvertStub, - FinalizeHTMLMapElement + FinalizeHTMLMapElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp index 60d1ef78c34..66d88fb1bf8 100644 --- a/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMenuElement.cpp @@ -73,10 +73,9 @@ GetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMENUELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMENUELEMENT_COMPACT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMENUELEMENT_COMPACT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLMenuElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMENUELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMENUELEMENT_COMPACT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMENUELEMENT_COMPACT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -194,7 +192,9 @@ JSClass HTMLMenuElementClass = { EnumerateHTMLMenuElement, ResolveHTMLMenuElement, JS_ConvertStub, - FinalizeHTMLMenuElement + FinalizeHTMLMenuElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp index d5f1adbf019..cf29a35db78 100644 --- a/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLMetaElement.cpp @@ -76,10 +76,9 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMETAELEMENT_CONTENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_CONTENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_CONTENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_HTTPEQUIV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_HTTPEQUIV, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_HTTPEQUIV, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -112,10 +110,9 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -130,10 +127,9 @@ GetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_SCHEME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_SCHEME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_SCHEME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -181,10 +177,9 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMETAELEMENT_CONTENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_CONTENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_CONTENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -195,10 +190,9 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_HTTPEQUIV: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_HTTPEQUIV, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_HTTPEQUIV, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -209,10 +203,9 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -223,10 +216,9 @@ SetHTMLMetaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMETAELEMENT_SCHEME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_SCHEME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMETAELEMENT_SCHEME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -291,7 +283,9 @@ JSClass HTMLMetaElementClass = { EnumerateHTMLMetaElement, ResolveHTMLMetaElement, JS_ConvertStub, - FinalizeHTMLMetaElement + FinalizeHTMLMetaElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLModElement.cpp b/mozilla/dom/src/html/nsJSHTMLModElement.cpp index dd500c03675..bdc90953efc 100644 --- a/mozilla/dom/src/html/nsJSHTMLModElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLModElement.cpp @@ -74,10 +74,9 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMODELEMENT_CITE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_CITE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_CITE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMODELEMENT_DATETIME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_DATETIME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_DATETIME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLMODELEMENT_CITE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_CITE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_CITE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -157,10 +154,9 @@ SetHTMLModElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLMODELEMENT_DATETIME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_DATETIME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLMODELEMENT_DATETIME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -225,7 +221,9 @@ JSClass HTMLModElementClass = { EnumerateHTMLModElement, ResolveHTMLModElement, JS_ConvertStub, - FinalizeHTMLModElement + FinalizeHTMLModElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp index 867f1f02431..d96e45a37fc 100644 --- a/mozilla/dom/src/html/nsJSHTMLOListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOListElement.cpp @@ -75,10 +75,9 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOLISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_COMPACT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_COMPACT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOLISTELEMENT_START: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_START, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_START, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOLISTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOLISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_COMPACT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_COMPACT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -178,10 +174,9 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOLISTELEMENT_START: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_START, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_START, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -198,10 +193,9 @@ SetHTMLOListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOLISTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOLISTELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -266,7 +260,9 @@ JSClass HTMLOListElementClass = { EnumerateHTMLOListElement, ResolveHTMLOListElement, JS_ConvertStub, - FinalizeHTMLOListElement + FinalizeHTMLOListElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp index 1bc05aa42d8..10f0b0bbd16 100644 --- a/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLObjectElement.cpp @@ -92,10 +92,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOBJECTELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -111,10 +110,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_CODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -129,10 +127,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -147,10 +144,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_ARCHIVE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ARCHIVE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ARCHIVE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -165,10 +161,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_BORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_BORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -183,10 +178,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_CODEBASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODEBASE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODEBASE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -201,10 +195,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_CODETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODETYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODETYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -219,10 +212,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DATA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DATA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -237,10 +229,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_DECLARE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DECLARE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DECLARE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -255,10 +246,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -273,10 +263,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -291,10 +280,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -309,10 +297,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_STANDBY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_STANDBY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_STANDBY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -327,10 +314,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -345,10 +331,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -363,10 +348,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_USEMAP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_USEMAP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -381,10 +365,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_VSPACE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_VSPACE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -399,10 +382,9 @@ GetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -450,10 +432,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOBJECTELEMENT_CODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -464,10 +445,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -478,10 +458,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_ARCHIVE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ARCHIVE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_ARCHIVE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -492,10 +471,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_BORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_BORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -506,10 +484,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_CODEBASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODEBASE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODEBASE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -520,10 +497,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_CODETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODETYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_CODETYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -534,10 +510,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_DATA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DATA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DATA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -548,10 +523,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_DECLARE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DECLARE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_DECLARE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -564,10 +538,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -578,10 +551,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_HSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_HSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -592,10 +564,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -606,10 +577,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_STANDBY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_STANDBY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_STANDBY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -620,10 +590,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -640,10 +609,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -654,10 +622,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_USEMAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_USEMAP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_USEMAP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -668,10 +635,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_VSPACE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_VSPACE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_VSPACE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -682,10 +648,9 @@ SetHTMLObjectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOBJECTELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOBJECTELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -750,7 +715,9 @@ JSClass HTMLObjectElementClass = { EnumerateHTMLObjectElement, ResolveHTMLObjectElement, JS_ConvertStub, - FinalizeHTMLObjectElement + FinalizeHTMLObjectElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp index c26c03a35cc..93d9128c140 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptGroupElement.cpp @@ -74,10 +74,9 @@ GetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLOPTGROUPELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLOPTGROUPELEMENT_LABEL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_LABEL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_LABEL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLOPTGROUPELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -159,10 +156,9 @@ SetHTMLOptGroupElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLOPTGROUPELEMENT_LABEL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_LABEL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTGROUPELEMENT_LABEL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -227,7 +223,9 @@ JSClass HTMLOptGroupElementClass = { EnumerateHTMLOptGroupElement, ResolveHTMLOptGroupElement, JS_ConvertStub, - FinalizeHTMLOptGroupElement + FinalizeHTMLOptGroupElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp index f1d794807a0..930bf16cebe 100644 --- a/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLOptionElement.cpp @@ -88,10 +88,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOPTIONELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -107,10 +106,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_DEFAULTSELECTED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DEFAULTSELECTED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DEFAULTSELECTED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -125,10 +123,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_TEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_TEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +140,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_INDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_INDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_INDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -161,10 +157,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -179,10 +174,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_LABEL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_LABEL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_LABEL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -197,10 +191,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_SELECTED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_SELECTED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_SELECTED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -215,10 +208,9 @@ GetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -266,10 +258,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLOPTIONELEMENT_DEFAULTSELECTED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DEFAULTSELECTED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DEFAULTSELECTED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -282,10 +273,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_TEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_TEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -296,10 +286,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_INDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_INDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_INDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -316,10 +305,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -332,10 +320,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_LABEL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_LABEL, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_LABEL, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -346,10 +333,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_SELECTED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_SELECTED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_SELECTED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -362,10 +348,9 @@ SetHTMLOptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLOPTIONELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLOPTIONELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -430,7 +415,9 @@ JSClass HTMLOptionElementClass = { EnumerateHTMLOptionElement, ResolveHTMLOptionElement, JS_ConvertStub, - FinalizeHTMLOptionElement + FinalizeHTMLOptionElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp index f74d1abb0c2..e5f16c3c772 100644 --- a/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParagraphElement.cpp @@ -73,10 +73,9 @@ GetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLPARAGRAPHELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAGRAPHELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAGRAPHELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLParagraphElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLPARAGRAPHELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAGRAPHELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAGRAPHELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLParagraphElementClass = { EnumerateHTMLParagraphElement, ResolveHTMLParagraphElement, JS_ConvertStub, - FinalizeHTMLParagraphElement + FinalizeHTMLParagraphElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp index e70a9fe72c5..9188801eca1 100644 --- a/mozilla/dom/src/html/nsJSHTMLParamElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLParamElement.cpp @@ -76,10 +76,9 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLPARAMELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -94,10 +93,9 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -112,10 +110,9 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -130,10 +127,9 @@ GetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_VALUETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUETYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUETYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -181,10 +177,9 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLPARAMELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -195,10 +190,9 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -209,10 +203,9 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -223,10 +216,9 @@ SetHTMLParamElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLPARAMELEMENT_VALUETYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUETYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPARAMELEMENT_VALUETYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -291,7 +283,9 @@ JSClass HTMLParamElementClass = { EnumerateHTMLParamElement, ResolveHTMLParamElement, JS_ConvertStub, - FinalizeHTMLParamElement + FinalizeHTMLParamElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp index 6d7b9576ba9..f5b47fb4ad3 100644 --- a/mozilla/dom/src/html/nsJSHTMLPreElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLPreElement.cpp @@ -73,10 +73,9 @@ GetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLPREELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPREELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPREELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLPreElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLPREELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPREELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLPREELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -198,7 +196,9 @@ JSClass HTMLPreElementClass = { EnumerateHTMLPreElement, ResolveHTMLPreElement, JS_ConvertStub, - FinalizeHTMLPreElement + FinalizeHTMLPreElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp index 0c5a7adc52b..46bed2e4bd4 100644 --- a/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLQuoteElement.cpp @@ -73,10 +73,9 @@ GetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLQUOTEELEMENT_CITE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLQUOTEELEMENT_CITE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLQUOTEELEMENT_CITE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLQuoteElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLQUOTEELEMENT_CITE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLQUOTEELEMENT_CITE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLQUOTEELEMENT_CITE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLQuoteElementClass = { EnumerateHTMLQuoteElement, ResolveHTMLQuoteElement, JS_ConvertStub, - FinalizeHTMLQuoteElement + FinalizeHTMLQuoteElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp index 1eed83b7f35..ec45d46d50f 100644 --- a/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLScriptElement.cpp @@ -79,10 +79,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSCRIPTELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -97,10 +96,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_HTMLFOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_HTMLFOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_HTMLFOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -115,10 +113,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_EVENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_EVENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_EVENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -133,10 +130,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_CHARSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_CHARSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -151,10 +147,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_DEFER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_DEFER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_DEFER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -169,10 +164,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_SRC, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_SRC, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -187,10 +181,9 @@ GetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -238,10 +231,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSCRIPTELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -252,10 +244,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_HTMLFOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_HTMLFOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_HTMLFOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -266,10 +257,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_EVENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_EVENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_EVENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -280,10 +270,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_CHARSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_CHARSET, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_CHARSET, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -294,10 +283,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_DEFER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_DEFER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_DEFER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -310,10 +298,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_SRC: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_SRC, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_SRC, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -324,10 +311,9 @@ SetHTMLScriptElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSCRIPTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSCRIPTELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -392,7 +378,9 @@ JSClass HTMLScriptElementClass = { EnumerateHTMLScriptElement, ResolveHTMLScriptElement, JS_ConvertStub, - FinalizeHTMLScriptElement + FinalizeHTMLScriptElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp index c41c0c5fa67..b21b5760ec5 100644 --- a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp @@ -93,10 +93,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSELECTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +110,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_SELECTEDINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SELECTEDINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SELECTEDINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -129,10 +127,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -147,10 +144,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_LENGTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_LENGTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_LENGTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRUint32 prop; nsresult result = NS_OK; @@ -165,10 +161,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -184,10 +179,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_OPTIONS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_OPTIONS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_OPTIONS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -203,10 +197,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -221,10 +214,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_MULTIPLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_MULTIPLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_MULTIPLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -239,10 +231,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -257,10 +248,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SIZE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SIZE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -275,10 +265,9 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -345,10 +334,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSELECTELEMENT_SELECTEDINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SELECTEDINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SELECTEDINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -365,10 +353,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -379,10 +366,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -395,10 +381,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_MULTIPLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_MULTIPLE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_MULTIPLE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -411,10 +396,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -425,10 +409,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_SIZE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SIZE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_SIZE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -445,10 +428,9 @@ SetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSELECTELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -525,16 +507,14 @@ HTMLSelectElementAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_ADD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_ADD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -588,16 +568,14 @@ HTMLSelectElementRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_REMOVE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_REMOVE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -639,16 +617,14 @@ HTMLSelectElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -683,16 +659,14 @@ HTMLSelectElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSELECTELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -734,16 +708,14 @@ NSHTMLSelectElementItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLSELECTELEMENT_ITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLSELECTELEMENT_ITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -781,7 +753,9 @@ JSClass HTMLSelectElementClass = { EnumerateHTMLSelectElement, ResolveHTMLSelectElement, JS_ConvertStub, - FinalizeHTMLSelectElement + FinalizeHTMLSelectElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp b/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp index 6a3e63b141d..ce2ef41838e 100644 --- a/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLStyleElement.cpp @@ -75,10 +75,9 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSTYLEELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -93,10 +92,9 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSTYLEELEMENT_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_MEDIA, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_MEDIA, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -111,10 +109,9 @@ GetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSTYLEELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -162,10 +159,9 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLSTYLEELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -178,10 +174,9 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSTYLEELEMENT_MEDIA: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_MEDIA, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_MEDIA, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,10 +187,9 @@ SetHTMLStyleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLSTYLEELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLSTYLEELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -260,7 +254,9 @@ JSClass HTMLStyleElementClass = { EnumerateHTMLStyleElement, ResolveHTMLStyleElement, JS_ConvertStub, - FinalizeHTMLStyleElement + FinalizeHTMLStyleElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp index 3bbdfaf066b..7b1e186337f 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableCaptionElement.cpp @@ -73,10 +73,9 @@ GetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case HTMLTABLECAPTIONELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECAPTIONELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECAPTIONELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLTableCaptionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case HTMLTABLECAPTIONELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECAPTIONELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECAPTIONELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLTableCaptionElementClass = { EnumerateHTMLTableCaptionElement, ResolveHTMLTableCaptionElement, JS_ConvertStub, - FinalizeHTMLTableCaptionElement + FinalizeHTMLTableCaptionElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp index 4c1d37f3ee8..d5baf0d9a3c 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableCellElement.cpp @@ -87,10 +87,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLTABLECELLELEMENT_CELLINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CELLINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CELLINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -105,10 +104,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ABBR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ABBR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ABBR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -123,10 +121,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -141,10 +138,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_AXIS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_AXIS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_AXIS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -159,10 +155,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -177,10 +172,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -195,10 +189,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CHOFF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CHOFF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -213,10 +206,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_COLSPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_COLSPAN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_COLSPAN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -231,10 +223,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_HEADERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEADERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEADERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -249,10 +240,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEIGHT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEIGHT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -267,10 +257,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_NOWRAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_NOWRAP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_NOWRAP, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -285,10 +274,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ROWSPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ROWSPAN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ROWSPAN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -303,10 +291,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_SCOPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_SCOPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_SCOPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -321,10 +308,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_VALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_VALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -339,10 +325,9 @@ GetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -390,10 +375,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case HTMLTABLECELLELEMENT_CELLINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CELLINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CELLINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -410,10 +394,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ABBR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ABBR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ABBR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -424,10 +407,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -438,10 +420,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_AXIS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_AXIS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_AXIS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -452,10 +433,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -466,10 +446,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -480,10 +459,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CHOFF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_CHOFF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -494,10 +472,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_COLSPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_COLSPAN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_COLSPAN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -514,10 +491,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_HEADERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEADERS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEADERS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -528,10 +504,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_HEIGHT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEIGHT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_HEIGHT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -542,10 +517,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_NOWRAP: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_NOWRAP, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_NOWRAP, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -558,10 +532,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_ROWSPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ROWSPAN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_ROWSPAN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -578,10 +551,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_SCOPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_SCOPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_SCOPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -592,10 +564,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_VALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_VALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -606,10 +577,9 @@ SetHTMLTableCellElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case HTMLTABLECELLELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECELLELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -674,7 +644,9 @@ JSClass HTMLTableCellElementClass = { EnumerateHTMLTableCellElement, ResolveHTMLTableCellElement, JS_ConvertStub, - FinalizeHTMLTableCellElement + FinalizeHTMLTableCellElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp index cbea3cd86c9..2b1b0245d8a 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableColElement.cpp @@ -78,10 +78,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTABLECOLELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -96,10 +95,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -114,10 +112,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CHOFF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CHOFF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -132,10 +129,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_SPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_SPAN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_SPAN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -150,10 +146,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_VALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_VALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -168,10 +163,9 @@ GetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -219,10 +213,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTABLECOLELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -233,10 +226,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,10 +239,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CHOFF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_CHOFF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -261,10 +252,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_SPAN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_SPAN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_SPAN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -281,10 +271,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_VALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_VALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -295,10 +284,9 @@ SetHTMLTableColElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLECOLELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLECOLELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -363,7 +351,9 @@ JSClass HTMLTableColElementClass = { EnumerateHTMLTableColElement, ResolveHTMLTableColElement, JS_ConvertStub, - FinalizeHTMLTableColElement + FinalizeHTMLTableColElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp index 66fbec1ed4f..2f89a473c92 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableElement.cpp @@ -94,10 +94,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLTABLEELEMENT_CAPTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CAPTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CAPTION, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableCaptionElement* prop; nsresult result = NS_OK; @@ -113,10 +112,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_THEAD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_THEAD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_THEAD, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableSectionElement* prop; nsresult result = NS_OK; @@ -132,10 +130,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_TFOOT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TFOOT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TFOOT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableSectionElement* prop; nsresult result = NS_OK; @@ -151,10 +148,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ROWS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ROWS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -170,10 +166,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_TBODIES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TBODIES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TBODIES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -189,10 +184,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -207,10 +201,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -225,10 +218,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BORDER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BORDER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -243,10 +235,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_CELLPADDING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLPADDING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLPADDING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -261,10 +252,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_CELLSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLSPACING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLSPACING, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -279,10 +269,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_FRAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_FRAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_FRAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -297,10 +286,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_RULES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_RULES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_RULES, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -315,10 +303,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_SUMMARY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_SUMMARY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_SUMMARY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -333,10 +320,9 @@ GetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_WIDTH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_WIDTH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -384,10 +370,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLTABLEELEMENT_CAPTION: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CAPTION, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CAPTION, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableCaptionElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -402,10 +387,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_THEAD: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_THEAD, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_THEAD, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableSectionElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -420,10 +404,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_TFOOT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TFOOT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_TFOOT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLTableSectionElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -438,10 +421,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -452,10 +434,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -466,10 +447,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_BORDER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BORDER, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_BORDER, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -480,10 +460,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_CELLPADDING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLPADDING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLPADDING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -494,10 +473,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_CELLSPACING: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLSPACING, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CELLSPACING, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -508,10 +486,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_FRAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_FRAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_FRAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -522,10 +499,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_RULES: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_RULES, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_RULES, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -536,10 +512,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_SUMMARY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_SUMMARY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_SUMMARY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -550,10 +525,9 @@ SetHTMLTableElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLTABLEELEMENT_WIDTH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_WIDTH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_WIDTH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -623,16 +597,14 @@ HTMLTableElementCreateTHead(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATETHEAD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATETHEAD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -667,16 +639,14 @@ HTMLTableElementDeleteTHead(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETETHEAD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETETHEAD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -712,16 +682,14 @@ HTMLTableElementCreateTFoot(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATETFOOT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATETFOOT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -756,16 +724,14 @@ HTMLTableElementDeleteTFoot(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETETFOOT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETETFOOT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -801,16 +767,14 @@ HTMLTableElementCreateCaption(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATECAPTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_CREATECAPTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -845,16 +809,14 @@ HTMLTableElementDeleteCaption(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETECAPTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETECAPTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -891,16 +853,14 @@ HTMLTableElementInsertRow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_INSERTROW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_INSERTROW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -943,16 +903,14 @@ HTMLTableElementDeleteRow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETEROW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEELEMENT_DELETEROW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -990,7 +948,9 @@ JSClass HTMLTableElementClass = { EnumerateHTMLTableElement, ResolveHTMLTableElement, JS_ConvertStub, - FinalizeHTMLTableElement + FinalizeHTMLTableElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp index bece34a8445..2797612c661 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableRowElement.cpp @@ -84,10 +84,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTABLEROWELEMENT_ROWINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ROWINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ROWINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -102,10 +101,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_SECTIONROWINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_SECTIONROWINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_SECTIONROWINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -120,10 +118,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CELLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CELLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -139,10 +136,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -157,10 +153,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_BGCOLOR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_BGCOLOR, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -175,10 +170,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -193,10 +187,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CHOFF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CHOFF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -211,10 +204,9 @@ GetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_VALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_VALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -262,10 +254,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTABLEROWELEMENT_ROWINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ROWINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ROWINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -282,10 +273,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_SECTIONROWINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_SECTIONROWINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_SECTIONROWINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -302,10 +292,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CELLS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CELLS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -320,10 +309,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -334,10 +322,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_BGCOLOR: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_BGCOLOR, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_BGCOLOR, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -348,10 +335,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -362,10 +348,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CHOFF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_CHOFF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -376,10 +361,9 @@ SetHTMLTableRowElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTABLEROWELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_VALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_VALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -450,16 +434,14 @@ HTMLTableRowElementInsertCell(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_INSERTCELL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_INSERTCELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -502,16 +484,14 @@ HTMLTableRowElementDeleteCell(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_DELETECELL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLEROWELEMENT_DELETECELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -549,7 +529,9 @@ JSClass HTMLTableRowElementClass = { EnumerateHTMLTableRowElement, ResolveHTMLTableRowElement, JS_ConvertStub, - FinalizeHTMLTableRowElement + FinalizeHTMLTableRowElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp index db547ab19bf..523bd89b916 100644 --- a/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTableSectionElement.cpp @@ -81,10 +81,9 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case HTMLTABLESECTIONELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -99,10 +98,9 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CH, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CH, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -117,10 +115,9 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CHOFF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CHOFF, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -135,10 +132,9 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_VALIGN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_VALIGN, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -153,10 +149,9 @@ GetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ROWS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ROWS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -205,10 +200,9 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval switch(JSVAL_TO_INT(id)) { case HTMLTABLESECTIONELEMENT_ALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_ALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -219,10 +213,9 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_CH: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CH, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CH, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -233,10 +226,9 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_CHOFF: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CHOFF, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_CHOFF, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -247,10 +239,9 @@ SetHTMLTableSectionElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval } case HTMLTABLESECTIONELEMENT_VALIGN: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_VALIGN, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_VALIGN, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -321,16 +312,14 @@ HTMLTableSectionElementInsertRow(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_INSERTROW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_INSERTROW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -373,16 +362,14 @@ HTMLTableSectionElementDeleteRow(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_DELETEROW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTABLESECTIONELEMENT_DELETEROW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -420,7 +407,9 @@ JSClass HTMLTableSectionElementClass = { EnumerateHTMLTableSectionElement, ResolveHTMLTableSectionElement, JS_ConvertStub, - FinalizeHTMLTableSectionElement + FinalizeHTMLTableSectionElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp index cc8cbafdec1..4b69d22bf1b 100644 --- a/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTextAreaElement.cpp @@ -90,10 +90,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTEXTAREAELEMENT_DEFAULTVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DEFAULTVALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DEFAULTVALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -108,10 +107,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_FORM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_FORM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_FORM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLFormElement* prop; nsresult result = NS_OK; @@ -127,10 +125,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ACCESSKEY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ACCESSKEY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -145,10 +142,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_COLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_COLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_COLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -163,10 +159,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DISABLED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DISABLED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -181,10 +176,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_NAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_NAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -199,10 +193,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_READONLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_READONLY, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_READONLY, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -217,10 +210,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ROWS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ROWS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -235,10 +227,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TABINDEX, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TABINDEX, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -253,10 +244,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -271,10 +261,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_VALUE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_VALUE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -289,10 +278,9 @@ GetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case NSHTMLTEXTAREAELEMENT_CONTROLLERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLTEXTAREAELEMENT_CONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSHTMLTEXTAREAELEMENT_CONTROLLERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIControllers* prop; nsIDOMNSHTMLTextAreaElement* b; @@ -349,10 +337,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp switch(JSVAL_TO_INT(id)) { case HTMLTEXTAREAELEMENT_DEFAULTVALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DEFAULTVALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DEFAULTVALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -363,10 +350,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_ACCESSKEY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ACCESSKEY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ACCESSKEY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -377,10 +363,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_COLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_COLS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_COLS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -397,10 +382,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_DISABLED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DISABLED, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_DISABLED, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -413,10 +397,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_NAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_NAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_NAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -427,10 +410,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_READONLY: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_READONLY, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_READONLY, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -443,10 +425,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_ROWS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ROWS, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_ROWS, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -463,10 +444,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_TABINDEX: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TABINDEX, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_TABINDEX, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; int32 temp; @@ -483,10 +463,9 @@ SetHTMLTextAreaElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp } case HTMLTEXTAREAELEMENT_VALUE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_VALUE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_VALUE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -555,16 +534,14 @@ HTMLTextAreaElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -599,16 +576,14 @@ HTMLTextAreaElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -643,16 +618,14 @@ HTMLTextAreaElementSelect(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_SELECT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTEXTAREAELEMENT_SELECT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -683,7 +656,9 @@ JSClass HTMLTextAreaElementClass = { EnumerateHTMLTextAreaElement, ResolveHTMLTextAreaElement, JS_ConvertStub, - FinalizeHTMLTextAreaElement + FinalizeHTMLTextAreaElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp index a3fda845d78..ac6cd738750 100644 --- a/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLTitleElement.cpp @@ -73,10 +73,9 @@ GetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLTITLEELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTITLEELEMENT_TEXT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTITLEELEMENT_TEXT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -124,10 +123,9 @@ SetHTMLTitleElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLTITLEELEMENT_TEXT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTITLEELEMENT_TEXT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLTITLEELEMENT_TEXT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -192,7 +190,9 @@ JSClass HTMLTitleElementClass = { EnumerateHTMLTitleElement, ResolveHTMLTitleElement, JS_ConvertStub, - FinalizeHTMLTitleElement + FinalizeHTMLTitleElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/html/nsJSHTMLUListElement.cpp b/mozilla/dom/src/html/nsJSHTMLUListElement.cpp index 667d681a8f3..a1c0f4f1ce1 100644 --- a/mozilla/dom/src/html/nsJSHTMLUListElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLUListElement.cpp @@ -74,10 +74,9 @@ GetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLULISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_COMPACT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_COMPACT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -92,10 +91,9 @@ GetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLULISTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_TYPE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_TYPE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -143,10 +141,9 @@ SetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case HTMLULISTELEMENT_COMPACT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_COMPACT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_COMPACT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToBool(&prop, cx, *vp)) { @@ -159,10 +156,9 @@ SetHTMLUListElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case HTMLULISTELEMENT_TYPE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_TYPE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_HTMLULISTELEMENT_TYPE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -227,7 +223,9 @@ JSClass HTMLUListElementClass = { EnumerateHTMLUListElement, ResolveHTMLUListElement, JS_ConvertStub, - FinalizeHTMLUListElement + FinalizeHTMLUListElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index 928b5236a1b..9a4856efaad 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -351,6 +351,11 @@ nsJSProtocolHandler::NewChannel(const char* verb, if (NS_FAILED(rv)) return rv; + nsCOMPtr owner = do_QueryInterface(principal); + rv = channel->SetOwner(owner); + if (NS_FAILED(rv)) + return rv; + *result = channel; return rv; } diff --git a/mozilla/dom/src/range/nsJSRange.cpp b/mozilla/dom/src/range/nsJSRange.cpp index c704eb3831e..c93df2283cf 100644 --- a/mozilla/dom/src/range/nsJSRange.cpp +++ b/mozilla/dom/src/range/nsJSRange.cpp @@ -84,10 +84,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case RANGE_STARTPARENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_STARTPARENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_STARTPARENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -103,10 +102,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case RANGE_STARTOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_STARTOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_STARTOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -121,10 +119,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case RANGE_ENDPARENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ENDPARENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ENDPARENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -140,10 +137,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case RANGE_ENDOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ENDOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ENDOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -158,10 +154,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case RANGE_ISCOLLAPSED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ISCOLLAPSED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_ISCOLLAPSED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -176,10 +171,9 @@ GetRangeProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case RANGE_COMMONPARENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COMMONPARENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COMMONPARENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -289,16 +283,14 @@ RangeSetStart(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTART, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTART, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -348,16 +340,14 @@ RangeSetStartBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTARTBEFORE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTARTBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -404,16 +394,14 @@ RangeSetStartAfter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTARTAFTER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETSTARTAFTER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -461,16 +449,14 @@ RangeSetEnd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETEND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETEND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -520,16 +506,14 @@ RangeSetEndBefore(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETENDBEFORE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETENDBEFORE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -576,16 +560,14 @@ RangeSetEndAfter(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETENDAFTER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SETENDAFTER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -632,16 +614,14 @@ RangeCollapse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COLLAPSE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COLLAPSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -684,16 +664,14 @@ RangeSelectNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SELECTNODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SELECTNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -740,16 +718,14 @@ RangeSelectNodeContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SELECTNODECONTENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SELECTNODECONTENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -798,16 +774,14 @@ RangeCompareEndPoints(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COMPAREENDPOINTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_COMPAREENDPOINTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -856,16 +830,14 @@ RangeDeleteContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_DELETECONTENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_DELETECONTENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -901,16 +873,14 @@ RangeExtractContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_EXTRACTCONTENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_EXTRACTCONTENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -946,16 +916,14 @@ RangeCloneContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_CLONECONTENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_CLONECONTENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -991,16 +959,14 @@ RangeInsertNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_INSERTNODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_INSERTNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1047,16 +1013,14 @@ RangeSurroundContents(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SURROUNDCONTENTS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_SURROUNDCONTENTS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1103,16 +1067,14 @@ RangeClone(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_CLONE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_CLONE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1148,16 +1110,14 @@ RangeToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_TOSTRING, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_RANGE_TOSTRING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1199,16 +1159,14 @@ NSRangeCreateContextualFragment(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSRANGE_CREATECONTEXTUALFRAGMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSRANGE_CREATECONTEXTUALFRAGMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1255,16 +1213,14 @@ NSRangeIsValidFragment(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSRANGE_ISVALIDFRAGMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_NSRANGE_ISVALIDFRAGMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1300,7 +1256,9 @@ JSClass RangeClass = { EnumerateRange, ResolveRange, JS_ConvertStub, - FinalizeRange + FinalizeRange, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/range/nsJSSelection.cpp b/mozilla/dom/src/range/nsJSSelection.cpp index e05d65aca20..2830bc60276 100644 --- a/mozilla/dom/src/range/nsJSSelection.cpp +++ b/mozilla/dom/src/range/nsJSSelection.cpp @@ -86,10 +86,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case SELECTION_ANCHORNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ANCHORNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ANCHORNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -105,10 +104,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SELECTION_ANCHOROFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ANCHOROFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ANCHOROFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -123,10 +121,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SELECTION_FOCUSNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_FOCUSNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_FOCUSNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -142,10 +139,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SELECTION_FOCUSOFFSET: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_FOCUSOFFSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_FOCUSOFFSET, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -160,10 +156,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SELECTION_ISCOLLAPSED: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ISCOLLAPSED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ISCOLLAPSED, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRBool prop; nsresult result = NS_OK; @@ -178,10 +173,9 @@ GetSelectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case SELECTION_RANGECOUNT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_RANGECOUNT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_RANGECOUNT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } PRInt32 prop; nsresult result = NS_OK; @@ -290,16 +284,14 @@ SelectionGetRangeAt(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_GETRANGEAT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_GETRANGEAT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -341,16 +333,14 @@ SelectionClearSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_CLEARSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_CLEARSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -387,16 +377,14 @@ SelectionCollapse(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -447,16 +435,14 @@ SelectionExtend(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_EXTEND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_EXTEND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -505,16 +491,14 @@ SelectionCollapseToStart(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSETOSTART, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSETOSTART, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -549,16 +533,14 @@ SelectionCollapseToEnd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSETOEND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_COLLAPSETOEND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -596,16 +578,14 @@ SelectionContainsNode(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_CONTAINSNODE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_CONTAINSNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -654,16 +634,14 @@ SelectionDeleteFromDocument(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_DELETEFROMDOCUMENT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_DELETEFROMDOCUMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -699,16 +677,14 @@ SelectionAddRange(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ADDRANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ADDRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -754,16 +730,14 @@ SelectionStartBatchChanges(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_STARTBATCHCHANGES, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_STARTBATCHCHANGES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -798,16 +772,14 @@ SelectionEndBatchChanges(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ENDBATCHCHANGES, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ENDBATCHCHANGES, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -843,16 +815,14 @@ SelectionAddSelectionListener(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ADDSELECTIONLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_ADDSELECTIONLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -899,16 +869,14 @@ SelectionRemoveSelectionListener(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_REMOVESELECTIONLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_REMOVESELECTIONLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -955,16 +923,14 @@ SelectionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_TOSTRING, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTION_TOSTRING, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -995,7 +961,9 @@ JSClass SelectionClass = { EnumerateSelection, ResolveSelection, JS_ConvertStub, - FinalizeSelection + FinalizeSelection, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/range/nsJSSelectionListener.cpp b/mozilla/dom/src/range/nsJSSelectionListener.cpp index 5fd99fe7eec..3a93fd7c3b7 100644 --- a/mozilla/dom/src/range/nsJSSelectionListener.cpp +++ b/mozilla/dom/src/range/nsJSSelectionListener.cpp @@ -160,16 +160,14 @@ SelectionListenerNotifySelectionChanged(JSContext *cx, JSObject *obj, uintN argc *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTIONLISTENER_NOTIFYSELECTIONCHANGED, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_SELECTIONLISTENER_NOTIFYSELECTIONCHANGED, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -200,7 +198,9 @@ JSClass SelectionListenerClass = { EnumerateSelectionListener, ResolveSelectionListener, JS_ConvertStub, - FinalizeSelectionListener + FinalizeSelectionListener, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/xul/nsJSXULCommandDispatcher.cpp b/mozilla/dom/src/xul/nsJSXULCommandDispatcher.cpp index 1eab9629eb0..0ba316051a1 100644 --- a/mozilla/dom/src/xul/nsJSXULCommandDispatcher.cpp +++ b/mozilla/dom/src/xul/nsJSXULCommandDispatcher.cpp @@ -82,10 +82,9 @@ GetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case XULCOMMANDDISPATCHER_FOCUSEDELEMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMElement* prop; nsresult result = NS_OK; @@ -101,10 +100,9 @@ GetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case XULCOMMANDDISPATCHER_FOCUSEDWINDOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -153,10 +151,9 @@ SetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case XULCOMMANDDISPATCHER_FOCUSEDELEMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -171,10 +168,9 @@ SetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case XULCOMMANDDISPATCHER_FOCUSEDWINDOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -250,16 +246,14 @@ XULCommandDispatcherAddCommandUpdater(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_ADDCOMMANDUPDATER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_ADDCOMMANDUPDATER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -308,16 +302,14 @@ XULCommandDispatcherRemoveCommandUpdater(JSContext *cx, JSObject *obj, uintN arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_REMOVECOMMANDUPDATER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_REMOVECOMMANDUPDATER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -364,16 +356,14 @@ XULCommandDispatcherUpdateCommands(JSContext *cx, JSObject *obj, uintN argc, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_UPDATECOMMANDS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_UPDATECOMMANDS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -415,16 +405,14 @@ XULCommandDispatcherGetControllerForCommand(JSContext *cx, JSObject *obj, uintN *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERFORCOMMAND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERFORCOMMAND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -466,16 +454,14 @@ XULCommandDispatcherGetControllers(JSContext *cx, JSObject *obj, uintN argc, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -507,7 +493,9 @@ JSClass XULCommandDispatcherClass = { EnumerateXULCommandDispatcher, ResolveXULCommandDispatcher, JS_ConvertStub, - FinalizeXULCommandDispatcher + FinalizeXULCommandDispatcher, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/xul/nsJSXULDocument.cpp b/mozilla/dom/src/xul/nsJSXULDocument.cpp index 74d7dc50baa..279c6f54583 100644 --- a/mozilla/dom/src/xul/nsJSXULDocument.cpp +++ b/mozilla/dom/src/xul/nsJSXULDocument.cpp @@ -86,10 +86,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULDOCUMENT_POPUPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -105,10 +104,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_TOOLTIPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -124,10 +122,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_COMMANDDISPATCHER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_COMMANDDISPATCHER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_COMMANDDISPATCHER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULCommandDispatcher* prop; nsresult result = NS_OK; @@ -143,10 +140,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_CONTROLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_CONTROLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_CONTROLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -195,10 +191,9 @@ SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULDOCUMENT_POPUPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -213,10 +208,9 @@ SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_TOOLTIPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -291,16 +285,14 @@ XULDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTBYID, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTBYID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -343,16 +335,14 @@ XULDocumentGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -395,16 +385,14 @@ XULDocumentPersist(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_PERSIST, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_PERSIST, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -441,7 +429,9 @@ JSClass XULDocumentClass = { EnumerateXULDocument, ResolveXULDocument, JS_ConvertStub, - FinalizeXULDocument + FinalizeXULDocument, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/xul/nsJSXULElement.cpp b/mozilla/dom/src/xul/nsJSXULElement.cpp index ebec582aec3..d702216a8ab 100644 --- a/mozilla/dom/src/xul/nsJSXULElement.cpp +++ b/mozilla/dom/src/xul/nsJSXULElement.cpp @@ -90,10 +90,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -108,10 +107,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -126,10 +124,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -145,10 +142,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_DATABASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFCompositeDataSource* prop; nsresult result = NS_OK; @@ -164,10 +160,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_RESOURCE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_RESOURCE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_RESOURCE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFResource* prop; nsresult result = NS_OK; @@ -183,10 +178,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CONTROLLERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CONTROLLERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIControllers* prop; nsresult result = NS_OK; @@ -235,10 +229,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -249,10 +242,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -263,10 +255,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_DATABASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFCompositeDataSource* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToXPCObject((nsISupports **) &prop, @@ -340,16 +331,14 @@ XULElementAddBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ADDBROADCASTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ADDBROADCASTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -398,16 +387,14 @@ XULElementRemoveBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_REMOVEBROADCASTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_REMOVEBROADCASTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -454,16 +441,14 @@ XULElementDoCommand(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DOCOMMAND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DOCOMMAND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -498,16 +483,14 @@ XULElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -542,16 +525,14 @@ XULElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -589,16 +570,14 @@ XULElementGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -635,7 +614,9 @@ JSClass XULElementClass = { EnumerateXULElement, ResolveXULElement, JS_ConvertStub, - FinalizeXULElement + FinalizeXULElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/src/xul/nsJSXULTreeElement.cpp b/mozilla/dom/src/xul/nsJSXULTreeElement.cpp index 2e1d4664b1b..9d060f78d91 100644 --- a/mozilla/dom/src/xul/nsJSXULTreeElement.cpp +++ b/mozilla/dom/src/xul/nsJSXULTreeElement.cpp @@ -80,10 +80,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULTREEELEMENT_SELECTEDITEMS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDITEMS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDITEMS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNodeList* prop; nsresult result = NS_OK; @@ -99,10 +98,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_SELECTEDCELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDCELLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDCELLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNodeList* prop; nsresult result = NS_OK; @@ -118,10 +116,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_CURRENTITEM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTITEM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULElement* prop; nsresult result = NS_OK; @@ -137,10 +134,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_CURRENTCELL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTCELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTCELL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULElement* prop; nsresult result = NS_OK; @@ -249,16 +245,14 @@ XULTreeElementSelectItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -305,16 +299,14 @@ XULTreeElementSelectCell(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -360,16 +352,14 @@ XULTreeElementClearItemSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARITEMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARITEMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -404,16 +394,14 @@ XULTreeElementClearCellSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARCELLSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARCELLSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -449,16 +437,14 @@ XULTreeElementAddItemToSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDITEMTOSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDITEMTOSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -505,16 +491,14 @@ XULTreeElementRemoveItemFromSelection(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVEITEMFROMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVEITEMFROMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -561,16 +545,14 @@ XULTreeElementAddCellToSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDCELLTOSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDCELLTOSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -617,16 +599,14 @@ XULTreeElementRemoveCellFromSelection(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVECELLFROMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVECELLFROMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -673,16 +653,14 @@ XULTreeElementToggleItemSelection(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLEITEMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLEITEMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -729,16 +707,14 @@ XULTreeElementToggleCellSelection(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLECELLSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLECELLSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -786,16 +762,14 @@ XULTreeElementSelectItemRange(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEMRANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEMRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -850,16 +824,14 @@ XULTreeElementSelectCellRange(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELLRANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELLRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -912,16 +884,14 @@ XULTreeElementSelectAll(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTALL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTALL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -956,16 +926,14 @@ XULTreeElementInvertSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_INVERTSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_INVERTSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1001,16 +969,14 @@ XULTreeElementEnsureElementIsVisible(JSContext *cx, JSObject *obj, uintN argc, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ENSUREELEMENTISVISIBLE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ENSUREELEMENTISVISIBLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1058,16 +1024,14 @@ XULTreeElementGetRowIndexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_GETROWINDEXOF, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_GETROWINDEXOF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1109,7 +1073,9 @@ JSClass XULTreeElementClass = { EnumerateXULTreeElement, ResolveXULTreeElement, JS_ConvertStub, - FinalizeXULTreeElement + FinalizeXULTreeElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/dom/tools/JSStubGen.cpp b/mozilla/dom/tools/JSStubGen.cpp index ca3df9631c1..95b3ad78694 100644 --- a/mozilla/dom/tools/JSStubGen.cpp +++ b/mozilla/dom/tools/JSStubGen.cpp @@ -537,10 +537,9 @@ static const char kPropFuncNamedItemEllipsisNonPrimaryStr[] = static const char kPropCaseBeginStr[] = " case %s_%s:\n" " {\n" -" PRBool ok = PR_FALSE;\n" -" secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_%s_%s, %s, &ok);\n" -" if (!ok) {\n" -" return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR);\n" +" rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_%s_%s, %s);\n" +" if (NS_FAILED(rv)) {\n" +" return nsJSUtils::nsReportError(cx, obj, rv);\n" " }\n"; static const char kPropCaseEndStr[] = @@ -1104,16 +1103,14 @@ static const char kMethodBodyBeginStr[] = "\n" " *rval = JSVAL_NULL;\n" "\n" " {\n" -" PRBool ok;\n" " nsresult rv;\n" " NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,\n" " NS_SCRIPTSECURITYMANAGER_PROGID, &rv);\n" -" if (NS_FAILED(rv)) {\n" -" return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR);\n" +" if (NS_SUCCEEDED(rv)) {\n" +" rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_%s_%s, PR_FALSE);\n" " }\n" -" secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_%s_%s, PR_FALSE, &ok);\n" -" if (!ok) {\n" -" return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR);\n" +" if (NS_FAILED(rv)) {\n" +" return nsJSUtils::nsReportError(cx, obj, rv);\n" " }\n" " }\n" "\n"; @@ -1477,7 +1474,9 @@ static const char kJSClassStr[] = " Enumerate%s,\n" " Resolve%s,\n" " JS_ConvertStub,\n" -" Finalize%s\n" +" Finalize%s,\n" +" nsnull,\n" +" nsJSUtils::nsCheckAccess\n" "};\n"; #define JSGEN_GENERATE_JSCLASS(buf, className) \ @@ -1487,7 +1486,7 @@ static const char kJSClassStr[] = void JSStubGen::GenerateJSClass(IdlSpecification &aSpec) { - char buf[512]; + char buf[1024]; ofstream *file = GetFile(); IdlInterface *iface = aSpec.GetInterfaceAt(0); char *name = iface->GetName(); diff --git a/mozilla/js/src/jsobj.c b/mozilla/js/src/jsobj.c index d69d62a2e7f..aec323c17f2 100644 --- a/mozilla/js/src/jsobj.c +++ b/mozilla/js/src/jsobj.c @@ -2513,7 +2513,7 @@ js_CheckAccess(JSContext *cx, JSObject *obj, jsid id, JSAccessMode mode, clasp = LOCKED_OBJ_GET_CLASS(obj); if (clasp->checkAccess) { JS_UNLOCK_OBJ(cx, pobj); - ok = clasp->checkAccess(cx, obj, sprop->id, mode, vp); + ok = clasp->checkAccess(cx, obj, id, mode, vp); JS_LOCK_OBJ(cx, pobj); } else { ok = JS_TRUE; diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp index 63efac093d4..25bad5963b7 100644 --- a/mozilla/layout/events/src/nsEventListenerManager.cpp +++ b/mozilla/layout/events/src/nsEventListenerManager.cpp @@ -595,14 +595,11 @@ nsresult nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *a NS_SCRIPTSECURITYMANAGER_PROGID, &rv); if (NS_FAILED(rv)) return rv; - PRBool ok; if (NS_FAILED(rv = securityManager->CheckScriptAccess(cx, jsobj, - NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_TRUE, &ok))) + NS_DOM_PROP_EVENTTARGET_ADDEVENTLISTENER, PR_TRUE))) { return rv; } - if (!ok) - return NS_ERROR_DOM_PROP_ACCESS_DENIED; return SetJSEventListener(aContext, aScriptObjectOwner, aName, aIID, PR_FALSE); } diff --git a/mozilla/rdf/content/src/nsJSXULCommandDispatcher.cpp b/mozilla/rdf/content/src/nsJSXULCommandDispatcher.cpp index 1eab9629eb0..0ba316051a1 100644 --- a/mozilla/rdf/content/src/nsJSXULCommandDispatcher.cpp +++ b/mozilla/rdf/content/src/nsJSXULCommandDispatcher.cpp @@ -82,10 +82,9 @@ GetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case XULCOMMANDDISPATCHER_FOCUSEDELEMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMElement* prop; nsresult result = NS_OK; @@ -101,10 +100,9 @@ GetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case XULCOMMANDDISPATCHER_FOCUSEDWINDOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; nsresult result = NS_OK; @@ -153,10 +151,9 @@ SetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v switch(JSVAL_TO_INT(id)) { case XULCOMMANDDISPATCHER_FOCUSEDELEMENT: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDELEMENT, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMElement* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -171,10 +168,9 @@ SetXULCommandDispatcherProperty(JSContext *cx, JSObject *obj, jsval id, jsval *v } case XULCOMMANDDISPATCHER_FOCUSEDWINDOW: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_FOCUSEDWINDOW, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMWindow* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -250,16 +246,14 @@ XULCommandDispatcherAddCommandUpdater(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_ADDCOMMANDUPDATER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_ADDCOMMANDUPDATER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -308,16 +302,14 @@ XULCommandDispatcherRemoveCommandUpdater(JSContext *cx, JSObject *obj, uintN arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_REMOVECOMMANDUPDATER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_REMOVECOMMANDUPDATER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -364,16 +356,14 @@ XULCommandDispatcherUpdateCommands(JSContext *cx, JSObject *obj, uintN argc, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_UPDATECOMMANDS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_UPDATECOMMANDS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -415,16 +405,14 @@ XULCommandDispatcherGetControllerForCommand(JSContext *cx, JSObject *obj, uintN *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERFORCOMMAND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERFORCOMMAND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -466,16 +454,14 @@ XULCommandDispatcherGetControllers(JSContext *cx, JSObject *obj, uintN argc, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULCOMMANDDISPATCHER_GETCONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -507,7 +493,9 @@ JSClass XULCommandDispatcherClass = { EnumerateXULCommandDispatcher, ResolveXULCommandDispatcher, JS_ConvertStub, - FinalizeXULCommandDispatcher + FinalizeXULCommandDispatcher, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/rdf/content/src/nsJSXULDocument.cpp b/mozilla/rdf/content/src/nsJSXULDocument.cpp index 74d7dc50baa..279c6f54583 100644 --- a/mozilla/rdf/content/src/nsJSXULDocument.cpp +++ b/mozilla/rdf/content/src/nsJSXULDocument.cpp @@ -86,10 +86,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULDOCUMENT_POPUPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -105,10 +104,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_TOOLTIPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; nsresult result = NS_OK; @@ -124,10 +122,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_COMMANDDISPATCHER: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_COMMANDDISPATCHER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_COMMANDDISPATCHER, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULCommandDispatcher* prop; nsresult result = NS_OK; @@ -143,10 +140,9 @@ GetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_CONTROLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_CONTROLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_CONTROLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMHTMLCollection* prop; nsresult result = NS_OK; @@ -195,10 +191,9 @@ SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULDOCUMENT_POPUPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_POPUPNODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -213,10 +208,9 @@ SetXULDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULDOCUMENT_TOOLTIPNODE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_TOOLTIPNODE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNode* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToObject((nsISupports **)&prop, @@ -291,16 +285,14 @@ XULDocumentGetElementById(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTBYID, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTBYID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -343,16 +335,14 @@ XULDocumentGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -395,16 +385,14 @@ XULDocumentPersist(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_PERSIST, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULDOCUMENT_PERSIST, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -441,7 +429,9 @@ JSClass XULDocumentClass = { EnumerateXULDocument, ResolveXULDocument, JS_ConvertStub, - FinalizeXULDocument + FinalizeXULDocument, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/rdf/content/src/nsJSXULEditorElement.cpp b/mozilla/rdf/content/src/nsJSXULEditorElement.cpp index 6bffaef4fd1..38b675d1ad6 100644 --- a/mozilla/rdf/content/src/nsJSXULEditorElement.cpp +++ b/mozilla/rdf/content/src/nsJSXULEditorElement.cpp @@ -75,10 +75,9 @@ GetXULEditorElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULEDITORELEMENT_EDITORSHELL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULEDITORELEMENT_EDITORSHELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULEDITORELEMENT_EDITORSHELL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIEditorShell* prop; nsresult result = NS_OK; @@ -182,7 +181,9 @@ JSClass XULEditorElementClass = { EnumerateXULEditorElement, ResolveXULEditorElement, JS_ConvertStub, - FinalizeXULEditorElement + FinalizeXULEditorElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/rdf/content/src/nsJSXULElement.cpp b/mozilla/rdf/content/src/nsJSXULElement.cpp index ebec582aec3..d702216a8ab 100644 --- a/mozilla/rdf/content/src/nsJSXULElement.cpp +++ b/mozilla/rdf/content/src/nsJSXULElement.cpp @@ -90,10 +90,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -108,10 +107,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -126,10 +124,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_STYLE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_STYLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_STYLE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMCSSStyleDeclaration* prop; nsresult result = NS_OK; @@ -145,10 +142,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_DATABASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFCompositeDataSource* prop; nsresult result = NS_OK; @@ -164,10 +160,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_RESOURCE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_RESOURCE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_RESOURCE, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFResource* prop; nsresult result = NS_OK; @@ -183,10 +178,9 @@ GetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CONTROLLERS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CONTROLLERS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CONTROLLERS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIControllers* prop; nsresult result = NS_OK; @@ -235,10 +229,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULELEMENT_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ID, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -249,10 +242,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_CLASSNAME: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_CLASSNAME, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsJSUtils::nsConvertJSValToString(prop, cx, *vp); @@ -263,10 +255,9 @@ SetXULElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULELEMENT_DATABASE: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_TRUE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DATABASE, PR_TRUE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIRDFCompositeDataSource* prop; if (PR_FALSE == nsJSUtils::nsConvertJSValToXPCObject((nsISupports **) &prop, @@ -340,16 +331,14 @@ XULElementAddBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsval * *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ADDBROADCASTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_ADDBROADCASTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -398,16 +387,14 @@ XULElementRemoveBroadcastListener(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_REMOVEBROADCASTLISTENER, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_REMOVEBROADCASTLISTENER, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -454,16 +441,14 @@ XULElementDoCommand(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DOCOMMAND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_DOCOMMAND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -498,16 +483,14 @@ XULElementFocus(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_FOCUS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_FOCUS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -542,16 +525,14 @@ XULElementBlur(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_BLUR, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_BLUR, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -589,16 +570,14 @@ XULElementGetElementsByAttribute(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULELEMENT_GETELEMENTSBYATTRIBUTE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -635,7 +614,9 @@ JSClass XULElementClass = { EnumerateXULElement, ResolveXULElement, JS_ConvertStub, - FinalizeXULElement + FinalizeXULElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/rdf/content/src/nsJSXULPopupElement.cpp b/mozilla/rdf/content/src/nsJSXULPopupElement.cpp index 135358cf44e..5a91d03fba8 100644 --- a/mozilla/rdf/content/src/nsJSXULPopupElement.cpp +++ b/mozilla/rdf/content/src/nsJSXULPopupElement.cpp @@ -168,16 +168,14 @@ XULPopupElementOpenPopup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULPOPUPELEMENT_OPENPOPUP, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULPOPUPELEMENT_OPENPOPUP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -232,16 +230,14 @@ XULPopupElementClosePopup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULPOPUPELEMENT_CLOSEPOPUP, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULPOPUPELEMENT_CLOSEPOPUP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -272,7 +268,9 @@ JSClass XULPopupElementClass = { EnumerateXULPopupElement, ResolveXULPopupElement, JS_ConvertStub, - FinalizeXULPopupElement + FinalizeXULPopupElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/rdf/content/src/nsJSXULTreeElement.cpp b/mozilla/rdf/content/src/nsJSXULTreeElement.cpp index 2e1d4664b1b..9d060f78d91 100644 --- a/mozilla/rdf/content/src/nsJSXULTreeElement.cpp +++ b/mozilla/rdf/content/src/nsJSXULTreeElement.cpp @@ -80,10 +80,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case XULTREEELEMENT_SELECTEDITEMS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDITEMS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDITEMS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNodeList* prop; nsresult result = NS_OK; @@ -99,10 +98,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_SELECTEDCELLS: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDCELLS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTEDCELLS, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMNodeList* prop; nsresult result = NS_OK; @@ -118,10 +116,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_CURRENTITEM: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTITEM, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULElement* prop; nsresult result = NS_OK; @@ -137,10 +134,9 @@ GetXULTreeElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) } case XULTREEELEMENT_CURRENTCELL: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTCELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CURRENTCELL, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsIDOMXULElement* prop; nsresult result = NS_OK; @@ -249,16 +245,14 @@ XULTreeElementSelectItem(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEM, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEM, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -305,16 +299,14 @@ XULTreeElementSelectCell(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -360,16 +352,14 @@ XULTreeElementClearItemSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARITEMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARITEMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -404,16 +394,14 @@ XULTreeElementClearCellSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARCELLSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_CLEARCELLSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -449,16 +437,14 @@ XULTreeElementAddItemToSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDITEMTOSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDITEMTOSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -505,16 +491,14 @@ XULTreeElementRemoveItemFromSelection(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVEITEMFROMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVEITEMFROMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -561,16 +545,14 @@ XULTreeElementAddCellToSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDCELLTOSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ADDCELLTOSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -617,16 +599,14 @@ XULTreeElementRemoveCellFromSelection(JSContext *cx, JSObject *obj, uintN argc, *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVECELLFROMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_REMOVECELLFROMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -673,16 +653,14 @@ XULTreeElementToggleItemSelection(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLEITEMSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLEITEMSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -729,16 +707,14 @@ XULTreeElementToggleCellSelection(JSContext *cx, JSObject *obj, uintN argc, jsva *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLECELLSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_TOGGLECELLSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -786,16 +762,14 @@ XULTreeElementSelectItemRange(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEMRANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTITEMRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -850,16 +824,14 @@ XULTreeElementSelectCellRange(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELLRANGE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTCELLRANGE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -912,16 +884,14 @@ XULTreeElementSelectAll(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTALL, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_SELECTALL, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -956,16 +926,14 @@ XULTreeElementInvertSelection(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_INVERTSELECTION, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_INVERTSELECTION, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1001,16 +969,14 @@ XULTreeElementEnsureElementIsVisible(JSContext *cx, JSObject *obj, uintN argc, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ENSUREELEMENTISVISIBLE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_ENSUREELEMENTISVISIBLE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1058,16 +1024,14 @@ XULTreeElementGetRowIndexOf(JSContext *cx, JSObject *obj, uintN argc, jsval *arg *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_GETROWINDEXOF, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_XULTREEELEMENT_GETROWINDEXOF, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -1109,7 +1073,9 @@ JSClass XULTreeElementClass = { EnumerateXULTreeElement, ResolveXULTreeElement, JS_ConvertStub, - FinalizeXULTreeElement + FinalizeXULTreeElement, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/xpfe/AppCores/src/nsJSAppCoresManager.cpp b/mozilla/xpfe/AppCores/src/nsJSAppCoresManager.cpp index 17245edf51f..d99b0efd132 100644 --- a/mozilla/xpfe/AppCores/src/nsJSAppCoresManager.cpp +++ b/mozilla/xpfe/AppCores/src/nsJSAppCoresManager.cpp @@ -162,16 +162,14 @@ AppCoresManagerStartup(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_STARTUP, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_STARTUP, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -206,16 +204,14 @@ AppCoresManagerShutdown(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_SHUTDOWN, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_SHUTDOWN, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -251,16 +247,14 @@ AppCoresManagerAdd(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_ADD, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_ADD, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -307,16 +301,14 @@ AppCoresManagerRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_REMOVE, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_REMOVE, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -364,16 +356,14 @@ AppCoresManagerFind(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_FIND, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_APPCORESMANAGER_FIND, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -409,7 +399,9 @@ JSClass AppCoresManagerClass = { EnumerateAppCoresManager, ResolveAppCoresManager, JS_ConvertStub, - FinalizeAppCoresManager + FinalizeAppCoresManager, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/xpfe/AppCores/src/nsJSBaseAppCore.cpp b/mozilla/xpfe/AppCores/src/nsJSBaseAppCore.cpp index 7c52f85b787..e188bff0de0 100644 --- a/mozilla/xpfe/AppCores/src/nsJSBaseAppCore.cpp +++ b/mozilla/xpfe/AppCores/src/nsJSBaseAppCore.cpp @@ -77,10 +77,9 @@ GetBaseAppCoreProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) switch(JSVAL_TO_INT(id)) { case BASEAPPCORE_ID: { - PRBool ok = PR_FALSE; - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_ID, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_ID, PR_FALSE); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } nsAutoString prop; nsresult result = NS_OK; @@ -188,16 +187,14 @@ BaseAppCoreInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_INIT, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_INIT, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -238,16 +235,14 @@ BaseAppCoreSetDocumentCharset(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_SETDOCUMENTCHARSET, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_BASEAPPCORE_SETDOCUMENTCHARSET, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -283,7 +278,9 @@ JSClass BaseAppCoreClass = { EnumerateBaseAppCore, ResolveBaseAppCore, JS_ConvertStub, - FinalizeBaseAppCore + FinalizeBaseAppCore, + nsnull, + nsJSUtils::nsCheckAccess }; diff --git a/mozilla/xpfe/AppCores/src/nsJSToolkitCore.cpp b/mozilla/xpfe/AppCores/src/nsJSToolkitCore.cpp index d3ea517e0f9..7e773b9bf64 100644 --- a/mozilla/xpfe/AppCores/src/nsJSToolkitCore.cpp +++ b/mozilla/xpfe/AppCores/src/nsJSToolkitCore.cpp @@ -168,16 +168,14 @@ ToolkitCoreShowDialog(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWDIALOG, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWDIALOG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -226,16 +224,14 @@ ToolkitCoreShowWindow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -285,16 +281,14 @@ ToolkitCoreShowWindowWithArgs(JSContext *cx, JSObject *obj, uintN argc, jsval *a *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOWWITHARGS, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWWINDOWWITHARGS, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -344,16 +338,14 @@ ToolkitCoreShowModalDialog(JSContext *cx, JSObject *obj, uintN argc, jsval *argv *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWMODALDIALOG, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_SHOWMODALDIALOG, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -401,16 +393,14 @@ ToolkitCoreCloseWindow(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js *rval = JSVAL_NULL; { - PRBool ok; nsresult rv; NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, NS_SCRIPTSECURITYMANAGER_PROGID, &rv); - if (NS_FAILED(rv)) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECMAN_ERR); + if (NS_SUCCEEDED(rv)) { + rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_CLOSEWINDOW, PR_FALSE); } - secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_TOOLKITCORE_CLOSEWINDOW, PR_FALSE, &ok); - if (!ok) { - return nsJSUtils::nsReportError(cx, obj, NS_ERROR_DOM_SECURITY_ERR); + if (NS_FAILED(rv)) { + return nsJSUtils::nsReportError(cx, obj, rv); } } @@ -452,7 +442,9 @@ JSClass ToolkitCoreClass = { EnumerateToolkitCore, ResolveToolkitCore, JS_ConvertStub, - FinalizeToolkitCore + FinalizeToolkitCore, + nsnull, + nsJSUtils::nsCheckAccess };