rpms/xulrunner/devel mfsa-2009-12.patch, NONE, 1.1 mfsa-2009-13.patch, NONE, 1.1 xulrunner.spec, 1.153, 1.154

[Christopher Aillon]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1194

Modified Files:
	xulrunner.spec 
Added Files:
	mfsa-2009-12.patch mfsa-2009-13.patch 
Log Message:
* Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.11
- Add patches for MFSA-2009-12, MFSA-2009-13


mfsa-2009-12.patch:

--- NEW FILE mfsa-2009-12.patch ---
# HG changeset patch
# User Blake Kaplan <mrbkap at gmail.com>
# Date 1238011664 25200
# Node ID 167d03699cdb98daa726b9024dd80ac3d9e80e06
# Parent c8c6ed1b96a72df7d47fb0ce014b18ec3f71abc7
Bug 485217 - Pop the eval context before returning. r+sr=peterv

--- a/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 22:10:03 2009 +0200
+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 13:07:44 2009 -0700
@@ -395,9 +395,9 @@ nsresult txXSLKey::testNode(const txXPat
             nsRefPtr<txAExprResult> exprResult;
             rv = mKeys[currKey].useExpr->evaluate(&evalContext,
                                                   getter_AddRefs(exprResult));
-            NS_ENSURE_SUCCESS(rv, rv);
 
             aEs.popEvalContext();
+            NS_ENSURE_SUCCESS(rv, rv);
 
             if (exprResult->getResultType() == txAExprResult::NODESET) {
                 txNodeSet* res = static_cast<txNodeSet*>

# HG changeset patch
# User Blake Kaplan <mrbkap at gmail.com>
# Date 1238052189 25200
# Node ID 4552d789ad8ff607e2596ad3107d33a3d0e92654
# Parent f087a48da189d0d6404040bc90a97f2624ab544f
Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking (a=ss for checkin into a CLOSED TREE).

--- a/content/xslt/src/xslt/txKeyFunctionCall.cpp	Wed Mar 25 16:59:14 2009 -0500
+++ b/content/xslt/src/xslt/txKeyFunctionCall.cpp	Thu Mar 26 00:23:09 2009 -0700
@@ -388,16 +388,19 @@ nsresult txXSLKey::testNode(const txXPat
     PRUint32 currKey, numKeys = mKeys.Length();
     for (currKey = 0; currKey < numKeys; ++currKey) {
         if (mKeys[currKey].matchPattern->matches(aNode, &aEs)) {
-            txSingleNodeContext evalContext(aNode, &aEs);
-            nsresult rv = aEs.pushEvalContext(&evalContext);
+            txSingleNodeContext *evalContext =
+                new txSingleNodeContext(aNode, &aEs);
+            NS_ENSURE_TRUE(evalContext, NS_ERROR_OUT_OF_MEMORY);
+
+            nsresult rv = aEs.pushEvalContext(evalContext);
             NS_ENSURE_SUCCESS(rv, rv);
 
             nsRefPtr<txAExprResult> exprResult;
-            rv = mKeys[currKey].useExpr->evaluate(&evalContext,
+            rv = mKeys[currKey].useExpr->evaluate(evalContext,
                                                   getter_AddRefs(exprResult));
+            NS_ENSURE_SUCCESS(rv, rv);
 
-            aEs.popEvalContext();
-            NS_ENSURE_SUCCESS(rv, rv);
+            delete aEs.popEvalContext();
 
             if (exprResult->getResultType() == txAExprResult::NODESET) {
                 txNodeSet* res = static_cast<txNodeSet*>



mfsa-2009-13.patch:

--- NEW FILE mfsa-2009-13.patch ---
# HG changeset patch
# User Olli Pettay <Olli.Pettay at helsinki.fi>
# Date 1237909358 -7200
# Node ID 60caf43ff9c21e7b4d6b07e3d2d8413196a86b25
# Parent 726d6e0d61def97cd6f9d72949ab283b83902d53
Bug 484320, r=dveditz, sr=mrbkap, a=blocking1.9.1

--- a/layout/xul/base/src/tree/src/nsTreeSelection.cpp	Wed Mar 18 11:00:20 2009 +0000
+++ b/layout/xul/base/src/tree/src/nsTreeSelection.cpp	Tue Mar 24 17:42:38 2009 +0200
@@ -268,6 +268,8 @@ nsTreeSelection::~nsTreeSelection()
 nsTreeSelection::~nsTreeSelection()
 {
   delete mFirstRange;
+  if (mSelectTimer)
+    mSelectTimer->Cancel();
 }
 
 // QueryInterface implementation for nsBoxObject




Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- xulrunner.spec	14 Mar 2009 00:22:20 -0000	1.153
+++ xulrunner.spec	27 Mar 2009 22:59:24 -0000	1.154
@@ -12,7 +12,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.10.beta3%{?dist}
+Release:        0.11.beta3%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -34,9 +34,9 @@
 Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
-Patch26:        mozilla-ps-pdf-simplify-operators.patch
-Patch27:        mozilla-ssl-exception.patch
-
+Patch100:       mozilla-ps-pdf-simplify-operators.patch
+Patch101:       mfsa-2009-12.patch
+Patch102:       mfsa-2009-13.patch
 
 # ---------------------------------------------------
 
@@ -156,8 +156,10 @@
 
 %patch10 -p1 -b .pk
 
-%patch26 -p1 -b .ps-pdf-simplify-operators
+%patch100 -p1 -b .ps-pdf-simplify-operators
 
+%patch101 -p1 -b .mfsa-2009-12
+%patch102 -p1 -b .mfsa-2009-13
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -450,6 +452,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Mar 27 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.11
+- Add patches for MFSA-2009-12, MFSA-2009-13
+
 * Fri Mar 13 2009 Christopher Aillon <caillon at redhat.com> 1.9.1-0.10
 - 1.9.1 beta 3