rpms/seamonkey/F-9 mfsa-2009-12.patch,1.1,1.2

[Christopher Aillon]

Author: caillon

Update of /cvs/extras/rpms/seamonkey/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32039/F-9

Modified Files:
	mfsa-2009-12.patch 
Log Message:
Use the patch for 1.8.1 not for 1.9.1


mfsa-2009-12.patch:

Index: mfsa-2009-12.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/F-9/mfsa-2009-12.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mfsa-2009-12.patch	28 Mar 2009 07:24:40 -0000	1.1
+++ mfsa-2009-12.patch	28 Mar 2009 16:58:48 -0000	1.2
@@ -1,37 +1,45 @@
-# 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);
+diff --git a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
+--- a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
++++ b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
+@@ -408,20 +408,19 @@ nsresult txXSLKey::testNode(const txXPat
+         if (key->matchPattern->matches(aNode, &aEs)) {
+             txSingleNodeContext evalContext(aNode, &aEs);
+             nsresult rv = aEs.pushEvalContext(&evalContext);
+             NS_ENSURE_SUCCESS(rv, rv);
  
-             aEs.popEvalContext();
-+            NS_ENSURE_SUCCESS(rv, rv);
+             nsRefPtr<txAExprResult> exprResult;
+             rv = key->useExpr->evaluate(&evalContext,
+                                         getter_AddRefs(exprResult));
++            aEs.popEvalContext();
+             NS_ENSURE_SUCCESS(rv, rv);
  
+-            aEs.popEvalContext();
+-
              if (exprResult->getResultType() == txAExprResult::NODESET) {
-                 txNodeSet* res = static_cast<txNodeSet*>
+                 txNodeSet* res = NS_STATIC_CAST(txNodeSet*,
+                                                 NS_STATIC_CAST(txAExprResult*,
+                                                                exprResult));
+                 PRInt32 i;
+                 for (i = 0; i < res->size(); ++i) {
+                     val.Truncate();
+                     txXPathNodeUtils::appendNodeValue(res->get(i), val);
 
-# 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).
+Bug 485286 - Allocate all of these consistently. r+sr=peterv/sicking a=ss
 
---- 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)) {
+diff --git a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
+--- a/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
++++ b/extensions/transformiix/source/xslt/functions/txKeyFunctionCall.cpp
+@@ -401,26 +401,30 @@ nsresult txXSLKey::testNode(const txXPat
+                             txExecutionState& aEs)
+ {
+     nsAutoString val;
+     txListIterator iter(&mKeys);
+     while (iter.hasNext())
+     {
+         Key* key = (Key*)iter.next();
+         if (key->matchPattern->matches(aNode, &aEs)) {
 -            txSingleNodeContext evalContext(aNode, &aEs);
 -            nsresult rv = aEs.pushEvalContext(&evalContext);
 +            txSingleNodeContext *evalContext =
@@ -42,16 +50,20 @@
              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);
- 
+-            rv = key->useExpr->evaluate(&evalContext,
++            rv = key->useExpr->evaluate(evalContext,
+                                         getter_AddRefs(exprResult));
 -            aEs.popEvalContext();
--            NS_ENSURE_SUCCESS(rv, rv);
-+            delete aEs.popEvalContext();
+             NS_ENSURE_SUCCESS(rv, rv);
  
++            delete aEs.popEvalContext();
++
              if (exprResult->getResultType() == txAExprResult::NODESET) {
-                 txNodeSet* res = static_cast<txNodeSet*>
-
+                 txNodeSet* res = NS_STATIC_CAST(txNodeSet*,
+                                                 NS_STATIC_CAST(txAExprResult*,
+                                                                exprResult));
+                 PRInt32 i;
+                 for (i = 0; i < res->size(); ++i) {
+                     val.Truncate();
+                     txXPathNodeUtils::appendNodeValue(res->get(i), val);