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


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

1.1
date	2009.04.22.08.49.19;	author miwi;	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 -U 8 -p -r3.181.2.104 jsinterp.c
--- js/src/jsinterp.c	20 Oct 2008 15:43:57 -0000	3.181.2.104
+++ js/src/jsinterp.c	2 Apr 2009 14:44:48 -0000
@@@@ -4722,21 +4722,21 @@@@ interrupt:
 
             /*
              * Try to optimize a property we either just created, or found
              * directly in the global object, that is permanent, has a slot,
              * and has stub getter and setter, into a "fast global" accessed
              * by the JSOP_*GVAR opcodes.
              */
             if (atomIndex < script->numGlobalVars &&
-                (attrs & JSPROP_PERMANENT) &&
                 obj2 == obj &&
                 OBJ_IS_NATIVE(obj)) {
                 sprop = (JSScopeProperty *) prop;
-                if (SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) &&
+                if ((sprop->attrs & JSPROP_PERMANENT) &&
+                    SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(obj)) &&
                     SPROP_HAS_STUB_GETTER(sprop) &&
                     SPROP_HAS_STUB_SETTER(sprop)) {
                     /*
                      * Fast globals use fp->vars to map the global name's
                      * atomIndex to the permanent fp->varobj slot number,
                      * tagged as a jsval.  The atomIndex for the global's
                      * name literal is identical to its fp->vars index.
                      */

@


1.1
log
@Backport patches to fix the following security vulnerabilities:

	CVE-2009-1312
	CVE-2009-0652
	CVE-2009-1302
	CVE-2009-1303

Obtained from:	Mozilla Bugzilla
Security:	http://www.vuxml.org/freebsd/3b18e237-2f15-11de-9672-0030843d3802.html
@
text
@@

