From 38bf6f042507c6051bfa2db5cc9b6666cfc35c2a Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Sat, 16 Mar 2002 22:03:31 +0000
Subject: [PATCH] small fix to avoid potential problem due to ordering of
 freeing data

* xpath.c: small fix to avoid potential problem due to
  ordering of freeing data
* python/Makefile.am: people were complaining about
  the generated file in python dir not being built
Daniel
---
 ChangeLog          | 7 +++++++
 python/Makefile.am | 2 +-
 xpath.c            | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be5e3be8..a4c7d0bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 16 23:01:42 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* xpath.c: small fix to avoid potential problem due to
+	  ordering of freeing data
+	* python/Makefile.am: people were complaining about 
+	  the generated file in python dir not being built
+
 Fri Mar 15 23:21:40 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* libxml.spec.in python/Makefile.am python/tests/Makefile.am
diff --git a/python/Makefile.am b/python/Makefile.am
index 1a188cbd..e0cd0527 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -56,7 +56,7 @@ GENERATED= $(srcdir)/libxml2class.py \
 $(GENERATED): $(srcdir)/$(GENERATE) $(API_DESC)
 	cd $(srcdir) && $(PYTHON) $(GENERATE)
 
-$(libxmlmodule_la_OBJECTS): $(GENERATED)
+$(libxml2mod_la_OBJECTS): $(GENERATED)
 else
 all: 
 endif
diff --git a/xpath.c b/xpath.c
index 1f575442..032c9b18 100644
--- a/xpath.c
+++ b/xpath.c
@@ -3071,8 +3071,8 @@ xmlXPathFreeObject(xmlXPathObjectPtr obj) {
     if ((obj->type == XPATH_NODESET) || (obj->type == XPATH_XSLT_TREE)) {
 	if (obj->boolval) {
 	    if (obj->user != NULL) {
-		xmlFreeNodeList((xmlNodePtr) obj->user);
                 xmlXPathFreeNodeSet(obj->nodesetval);
+		xmlFreeNodeList((xmlNodePtr) obj->user);
 	    } else if (obj->nodesetval != NULL)
 		xmlXPathFreeValueTree(obj->nodesetval);
 	} else {