Import upstream version 2.7.1upstream/2.7.1.dfsg

3 files changed, 57 insertions, 2 deletions

diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
index 8a85075..52c89fc 100644
--- a/python/tests/Makefile.am
+++ b/python/tests/Makefile.am
@@ -46,7 +46,8 @@ PYTESTS=	\
     validSchemas.py \
     validRNG.py \
     compareNodes.py \
-    xpathns.py
+    xpathns.py \
+    xpathleak.py
 
 XMLS=		\
     tst.xml	\
diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in
index d7c00e5..ec3036f 100644
--- a/python/tests/Makefile.in
+++ b/python/tests/Makefile.in
@@ -317,7 +317,8 @@ PYTESTS = \
     validSchemas.py \
     validRNG.py \
     compareNodes.py \
-    xpathns.py
+    xpathns.py \
+    xpathleak.py
 
 XMLS = \
     tst.xml	\
diff --git a/python/tests/xpathleak.py b/python/tests/xpathleak.py
new file mode 100755
index 0000000..dcc144c
--- /dev/null
+++ b/python/tests/xpathleak.py
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+import sys, libxml2
+
+libxml2.debugMemory(True)
+
+expect="""--> Invalid expression
+--> xmlXPathEval: evaluation failed
+--> Invalid expression
+--> xmlXPathEval: evaluation failed
+--> Invalid expression
+--> xmlXPathEval: evaluation failed
+--> Invalid expression
+--> xmlXPathEval: evaluation failed
+--> Invalid expression
+--> xmlXPathEval: evaluation failed
+--> Invalid expression
+--> xmlXPathEval: evaluation failed
+"""
+err=""
+def callback(ctx, str):
+     global err
+
+     err = err + "%s %s" % (ctx, str)
+
+libxml2.registerErrorHandler(callback, "-->")
+
+doc = libxml2.parseDoc("<fish/>")
+ctxt = doc.xpathNewContext()
+ctxt.setContextNode(doc)
+for expr in (":false()","bad:()","bad(:)",":bad(:)","bad:(:)","bad:bad(:)"):
+	try:
+		ctxt.xpathEval(expr)
+	except libxml2.xpathError, e:
+	        pass
+	else:
+		print "Unexpectedly legal expression:", expr
+ctxt.xpathFreeContext()
+doc.freeDoc()
+
+if err != expect:
+    print "error"
+    print "received %s" %(err)
+    print "expected %s" %(expect)
+    sys.exit(1)
+
+libxml2.cleanupParser()
+leakedbytes = libxml2.debugMemory(True)
+if leakedbytes == 0:
+	print "OK"
+else:
+	print "Memory leak", leakedbytes, "bytes"
+	# drop file to .memdump file in cwd, but won't work if not compiled in
+	libxml2.dumpMemory()