← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xulrunner-1.9/utopic

« back to all changes in this revision

Viewing changes to mozilla/extensions/xforms/nsXFormsInstanceElement.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack, Fabien Tassin
  • Date: 2009-02-05 09:12:37 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20090205091237-2uu65i47p00yi2xk
Tags: 1.9.0.6+nobinonly-0ubuntu1
https://launchpad.net/bugs/303940
[ Alexander Sack <asac@ubuntu.com> ]
* new security/stability update v1.9.0.6 (FIREFOX_3_0_6_RELEASE)
  - see USN-717-1
* adjust patches to changed code base
  - update debian/patches/dom_inspector_support_for_prism.patch

[ Fabien Tassin <fta@ubuntu.com> ]
* Fix preinst script to better handle the /etc/gre.d clean-up
  - update debian/xulrunner-1.9.preinst.in
* Fix permissions in the -dev package (LP: #303940)
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/extensions/xforms/nsXFormsInstanceElement.cpp
208
208
  NS_PRECONDITION(aNewChannel, "Redirect without a channel?");
209
209
  NS_PRECONDITION(!mLazy, "Loading an instance document for a lazy instance?");
210
210
 
211
 
  nsCOMPtr<nsIURI> newURI;
 
211
  nsCOMPtr<nsIURI> newURI, newOrigURI;
212
212
  nsresult rv = aNewChannel->GetURI(getter_AddRefs(newURI));
213
213
  NS_ENSURE_SUCCESS(rv, rv);
 
214
  rv = aNewChannel->GetOriginalURI(getter_AddRefs(newOrigURI));
 
215
  NS_ENSURE_SUCCESS(rv, rv);
214
216
 
215
 
  if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI)) {
 
217
  if (!nsXFormsUtils::CheckConnectionAllowed(mElement, newURI) ||
 
218
      (newOrigURI != newURI &&
 
219
       !nsXFormsUtils::CheckConnectionAllowed(mElement, newOrigURI))) {
216
220
    const PRUnichar *strings[] = { NS_LITERAL_STRING("instance").get() };
217
221
    nsXFormsUtils::ReportError(NS_LITERAL_STRING("externalLinkLoadOrigin"),
218
222
                               strings, 1, mElement, mElement);