зеркало из https://github.com/mozilla/gecko-dev.git
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.
This commit is contained in:
Родитель
0b335c2468
Коммит
cc328d32e6
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче