Added code to mark the results of str:tokenize and str:split as "function

* libexslt/strings.c: Added code to mark the results of
  str:tokenize and str:split as "function result" to avoid
  garbage-collecting them during global variable initialisation.
  Should fix bug #495995.

svn path=/trunk/; revision=1448

2 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f329a4e..2f689666 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov 12 13:53:58 PDT 2007 William Brack <wbrack@mmm.com.hk>
+
+	* libexslt/strings.c: Added code to mark the results of
+	  str:tokenize and str:split as "function result" to avoid
+	  garbage-collecting them during global variable initialisation.
+	  Should fix bug #495995.
+
 Wed Oct 24 17:41:08 PDT 2007 William Brack <wbrack@mmm.com.hk>
 
 	* python/libxslt.c: changed iterator argument for Py_Dict_Next
diff --git a/libexslt/strings.c b/libexslt/strings.c
index af7aa88a..e4eb3eab 100644
--- a/libexslt/strings.c
+++ b/libexslt/strings.c
@@ -111,6 +111,11 @@ exsltStrTokenizeFunction(xmlXPathParserContextPtr ctxt, int nargs)
                 xmlAddChild((xmlNodePtr) container, node);
 	        xmlXPathNodeSetAddUnique(ret->nodesetval, node);
             }
+	    /*
+	     * Mark it as a function result in order to avoid garbage
+	     * collecting of tree fragments
+	     */
+	    xsltExtensionInstructionResultRegister(tctxt, ret);
         }
     }
 
@@ -217,6 +222,11 @@ exsltStrSplitFunction(xmlXPathParserContextPtr ctxt, int nargs) {
 		xmlAddChild((xmlNodePtr) container, node);
 		xmlXPathNodeSetAddUnique(ret->nodesetval, node);
 	    }
+	    /*
+	     * Mark it as a function result in order to avoid garbage
+	     * collecting of tree fragments
+	     */
+	    xsltExtensionInstructionResultRegister(tctxt, ret);
         }
     }