Fix 16836 "Security error accessing DOM elements inside an IFrame"
r=vidur@netscape.com Also, bug 16536 "Security disallows opening resource URL" no longer occurs after this fix. git-svn-id: svn://10.0.0.236/trunk@51893 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1654,17 +1654,11 @@ nsHTMLDocument::GetSourceDocumentURL(JSContext* cx,
|
||||
|
||||
result = window->GetDocument(getter_AddRefs(document));
|
||||
if (NS_SUCCEEDED(result)) {
|
||||
nsCOMPtr<nsIDOMHTMLDocument> htmlDocument(do_QueryInterface(document, &result));
|
||||
if (htmlDocument) {
|
||||
nsAutoString url;
|
||||
|
||||
htmlDocument->GetURL(url);
|
||||
#ifndef NECKO
|
||||
result = NS_NewURL(sourceURL, url);
|
||||
#else
|
||||
result = NS_NewURI(sourceURL, url);
|
||||
#endif // NECKO
|
||||
}
|
||||
nsCOMPtr<nsIDocument> doc(do_QueryInterface(document, &result));
|
||||
if (doc) {
|
||||
*sourceURL = doc->GetDocumentURL();
|
||||
result = sourceURL ? NS_OK : NS_ERROR_FAILURE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user