head	1.2;
access;
symbols
	old_RELEASE_8_0_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.02.07.21.48.44;	author beat;	state dead;
branches;
next	1.1;

1.1
date	2009.06.13.07.05.48;	author beat;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to 3.6

What's new in Firefox 3.6:

  * Support for the HTML5 File API
  * A change to how third-party software integrates with Firefox to
    increase stability.
  * The ability to run scripts asynchronously to speed up page load times.
  * A mechanism to prevent incompatible software from crashing Firefox.
  * Users can now change their browser's appearance with a single click,
    with built in support for Personas.
  * Firefox 3.6 will alert users about out of date plugins to keep them
    safe.
  * Open, native video can now be displayed full screen, and supports
    poster frames.
  * Support for the WOFF font format.
  * Improved JavaScript performance, overall browser responsiveness and
    startup time.
  * Support for new CSS, DOM and HTML5 web technologies.

Thanks to:	Andreas Tobler, Florian Smeets, nox@@, miwi@@ and all testers
@
text
@diff -U12 -up mozilla/content/base/src/nsContentUtils.cpp.489131 mozilla/content/base/src/nsContentUtils.cpp
--- content/base/src/nsContentUtils.cpp.489131	2009-05-14 13:30:53.000000000 +0200
+++ content/base/src/nsContentUtils.cpp	2009-05-14 13:30:53.000000000 +0200
@@@@ -2310,24 +2310,25 @@@@ nsCxPusher::Push(nsISupports *aCurrentTa
   if (mScx) {
     NS_ERROR("Whaaa! No double pushing with nsCxPusher::Push()!");
 
     return PR_FALSE;
   }
 
   nsCOMPtr<nsIScriptGlobalObject> sgo;
   nsCOMPtr<nsIContent> content(do_QueryInterface(aCurrentTarget));
   nsCOMPtr<nsIDocument> document;
 
   if (content) {
     document = content->GetOwnerDoc();
+    NS_ENSURE_TRUE(document, PR_FALSE);
   }
 
   if (!document) {
     document = do_QueryInterface(aCurrentTarget);
   }
 
   if (document) {
     nsCOMPtr<nsIDocument_MOZILLA_1_8_BRANCH3> branch3doc =
       do_QueryInterface(document);
     NS_ASSERTION(branch3doc,
                  "Document must implement nsIDocument_MOZILLA_1_8_BRANCH3!!!");
     PRBool hasHadScriptObject = PR_TRUE;
@


1.1
log
@- Backport patches to fix the following security vulnerabilities:
  CVE-2009-1834
  CVE-2009-1835
  CVE-2009-1836
  CVE-2009-1838
  CVE-2009-1841

Obtained from:	Mozilla Bugzilla
Security:	http://www.vuxml.org/freebsd/da185955-5738-11de-b857-000f20797ede.html
With hat:	Gecko gang
@
text
@@

