From 798ae54344dad8ee3e32c3e18132e50d360a0cd2 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Mon, 3 Nov 2003 17:13:52 +0000
Subject: [PATCH] fixed bug #125812, about XPointer in XInclude failing but not
 returning an

* xinclude.c: fixed bug #125812, about XPointer in XInclude
  failing but not returning an error.
Daniel
---
 ChangeLog  | 5 +++++
 xinclude.c | 7 +++++++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 75da7a58..7f9cb73c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov  3 17:51:28 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+	* xinclude.c: fixed bug #125812, about XPointer in XInclude 
+	  failing but not returning an error.
+
 Mon Nov  3 17:18:22 CET 2003 Daniel Veillard <daniel@veillard.com>
 
 	* valid.c: fixed bug #125811 related to DTD post validation
diff --git a/xinclude.c b/xinclude.c
index 6358f1e1..f4d6aee3 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -1394,6 +1394,13 @@ loaded:
 		xmlFree(fragment);
 		return(-1);
 	    case XPATH_NODESET:
+	        if ((xptr->nodesetval == NULL) ||
+		    (xptr->nodesetval->nodeNr <= 0)) {
+		    xmlXPathFreeContext(xptrctxt);
+		    xmlFree(URL);
+		    xmlFree(fragment);
+		    return(-1);
+		}
 	    case XPATH_RANGE:
 	    case XPATH_LOCATIONSET:
 		break;