Attachment #186687 for bug #222580

Lines 13-18 Link Here

(-)Makefile (-4 / +11 lines)
13	MAINTAINER?= gnome@FreeBSD.org	13	MAINTAINER?= gnome@FreeBSD.org
14	COMMENT?= XML parser library for GNOME	14	COMMENT?= XML parser library for GNOME
15		15
		16	LICENSE= MIT TRIO
		17	LICENSE_COMB= multi
		18	LICENSE_NAME_TRIO= Trio License
		19	LICENSE_FILE_MIT= ${WRKSRC}/COPYING
		20	LICENSE_FILE_TRIO= ${FILESDIR}/LICENSE.TRIO
		21	LICENSE_PERMS_TRIO= ${_LICENSE_PERMS_DEFAULT}
		22
16	.if !defined(REFERENCE_PORT)	23	.if !defined(REFERENCE_PORT)
17		24
18	GNU_CONFIGURE= yes	25	GNU_CONFIGURE= yes
Lines 32-38 Link Here
32		39
33	.if !defined(MASTERDIR)	40	.if !defined(MASTERDIR)
34		41
35	OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC	42	OPTIONS_DEFINE= SCHEMA VALID THREADS MEM_DEBUG XMLLINT_HIST THREAD_ALLOC
36	OPTIONS_DEFAULT=SCHEMA VALID THREADS	43	OPTIONS_DEFAULT=SCHEMA VALID THREADS
37	SCHEMA_DESC= XML schema support	44	SCHEMA_DESC= XML schema support
38	SCHEMA_CONFIGURE_WITH= schemas	45	SCHEMA_CONFIGURE_WITH= schemas
Lines 40-50 Link Here
40	VALID_CONFIGURE_OFF= --without-valid	47	VALID_CONFIGURE_OFF= --without-valid
41	THREADS_DESC= Threads support	48	THREADS_DESC= Threads support
42	THREADS_CONFIGURE_WITH= threads	49	THREADS_CONFIGURE_WITH= threads
43	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)	50	MEM_DEBUG_DESC= Memory debugging (DEVELOPERS ONLY!)
44	MEM_DEBUG_CONFIGURE_WITH= mem-debug	51	MEM_DEBUG_CONFIGURE_WITH= mem-debug
45	XMLLINT_HIST_DESC= History for xmllint	52	XMLLINT_HIST_DESC= History for xmllint
46	XMLLINT_HIST_CONFIGURE_WITH= history	53	XMLLINT_HIST_CONFIGURE_WITH= history
47	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)	54	THREAD_ALLOC_DESC= Per-thread memory (DEVELOPERS ONLY!)
48	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc	55	THREAD_ALLOC_CONFIGURE_WITH= thread-alloc
49		56
50	.endif # !defined(MASTERDIR)	57	.endif # !defined(MASTERDIR)




(Following sentences are gotten from trio.c of source archive.)

Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.

Permission to use, copy, modify, and distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.




--- Makefile.in.orig	2017-09-20 18:23:56 UTC
+++ Makefile.in
@@ -1245,7 +1245,7 @@ distclean-compile:
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -1730,7 +1730,7 @@ distcleancheck: distclean
 check-am: all-am
 check: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) check-recursive

 		config.h
 install-binPROGRAMS: install-libLTLIBRARIES
 
@@ -1798,7 +1798,7 @@ info: info-recursive
 
 info-am:
 

Lines 1-7 Link Here

(-)files/patch-config.h.in (-4 / +5 lines)
1	--- config.h.in.orig 2012-05-23 10:56:31.000000000 +0200	1	--- config.h.in.orig 2016-05-23 08:00:35 UTC
2	+++ config.h.in 2012-07-23 09:34:22.000000000 +0200	2	+++ config.h.in
3	@@ -1,5 +1,8 @@	3	@@ -3,6 +3,9 @@
4	/* config.h.in. Generated from configure.in by autoheader. */	4	/* Type cast for the gethostbyname() argument */
		5	#undef GETHOSTBYNAME_ARG_CAST
5		6
6	+/* XXX */	7	+/* XXX */
7	+#define HAVE_VFSCANF	8	+#define HAVE_VFSCANF

Lines 1-6 Link Here

(-)files/patch-configure (-3 / +3 lines)
1	--- configure.orig 2013-11-24 09:41:13.000000000 +0100	1	--- configure.orig 2016-05-23 08:00:35 UTC
2	+++ configure 2013-11-24 09:41:55.000000000 +0100	2	+++ configure
3	@@ -14499,6 +14499,8 @@	3	@@ -15639,6 +15639,8 @@ fi
4	fi	4	fi
5	fi	5	fi
6	;;	6	;;




- Add sanity check for empty stack.

Found with afl-fuzz.
--- result/XPath/xptr/viderror.orig	2017-09-20 18:23:56 UTC
+++ result/XPath/xptr/viderror
@@ -0,0 +1,4 @@
+
+========================
+Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
+Object is empty (NULL)
 result/XPath/xptr/viderror | 4 ++++
 test/XPath/xptr/viderror   | 1 +
 xpath.c                    | 7 ++++++-

 create mode 100644 result/XPath/xptr/viderror
 create mode 100644 test/XPath/xptr/viderror

diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror
new file mode 100644
--- test/XPath/xptr/viderror.orig	2017-09-20 18:23:56 UTC
--- /dev/null
+++ result/XPath/xptr/viderror
@@ -0,0 +1,4 @@
+
+========================
+Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
+Object is empty (NULL)
diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror
new file mode 100644
index 0000000..da8c53b
--- /dev/null
+++ test/XPath/xptr/viderror
@@ -0,0 +1 @@
+xpointer(non-existing-fn()/range-to(id('chapter2')))
--- xpath.c.orig	2016-05-23 07:25:25 UTC
index 113bce6..751665b 100644
--- xpath.c
+++ xpath.c
@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContext
                 xmlNodeSetPtr oldset;
                 int i, j;
 

                 if (op->ch2 == -1)
                     return (total);
 
-- 
cgit v0.12


Lines 1-6 Link Here

(-)files/patch-libxml-2.0-uninstalled.pc.in (-3 / +3 lines)
1	--- libxml-2.0-uninstalled.pc.in.orig 2014-10-03 11:00:53.000000000 +0200	1	--- libxml-2.0-uninstalled.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0-uninstalled.pc.in 2015-07-31 13:26:13.641069000 +0200	2	+++ libxml-2.0-uninstalled.pc.in
3	@@ -8,5 +8,5 @@	3	@@ -8,5 +8,5 @@ Name: libXML
4	Version: @VERSION@	4	Version: @VERSION@
5	Description: libXML library version2.	5	Description: libXML library version2.
6	Requires:	6	Requires:

Lines 1-6 Link Here

(-)files/patch-libxml-2.0.pc.in (-3 / +3 lines)
1	--- libxml-2.0.pc.in.orig 2014-10-03 11:00:53.000000000 +0200	1	--- libxml-2.0.pc.in.orig 2016-02-09 10:17:32 UTC
2	+++ libxml-2.0.pc.in 2015-07-31 13:26:13.647320000 +0200	2	+++ libxml-2.0.pc.in
3	@@ -9,5 +9,5 @@	3	@@ -9,5 +9,5 @@ Version: @VERSION@
4	Description: libXML library version2.	4	Description: libXML library version2.
5	Requires:	5	Requires:
6	Libs: -L${libdir} -lxml2	6	Libs: -L${libdir} -lxml2

Lines 1-6 Link Here

(-)files/patch-python_Makefile.in (-4 / +4 lines)
1	--- python/Makefile.in.orig 2013-11-24 08:47:04.000000000 +0100	1	--- python/Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ python/Makefile.in 2013-11-24 08:51:02.000000000 +0100	2	+++ python/Makefile.in
3	@@ -415,7 +415,7 @@	3	@@ -489,7 +489,7 @@ top_srcdir = @top_srcdir@
4		4
5	# Makefile for libxml2 python library	5	# Makefile for libxml2 python library
6	AUTOMAKE_OPTIONS = 1.4 foreign	6	AUTOMAKE_OPTIONS = 1.4 foreign
Lines 9-15 Link Here
9	docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)	9	docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
10	dist_docs_DATA = TODO	10	dist_docs_DATA = TODO
11	EXTRA_DIST = \	11	EXTRA_DIST = \
12	@@ -435,7 +435,7 @@	12	@@ -509,7 +509,7 @@ EXTRA_DIST = \
13	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la	13	@WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la
14	@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c	14	@WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c
15	@WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \	15	@WITH_PYTHON_TRUE@libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \

Lines 1-7 Link Here

(-)files/patch-python_tests_Makefile.in (-4 / +4 lines)
1	--- python/tests/Makefile.in.orig 2008-05-23 22:41:49.000000000 -0500	1	--- python/tests/Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ python/tests/Makefile.in 2008-05-23 22:42:12.000000000 -0500	2	+++ python/tests/Makefile.in
3	@@ -270,7 +270,7 @@	3	@@ -385,7 +385,7 @@ target_alias = @target_alias@
4	target_alias = @target_alias@	4	top_build_prefix = @top_build_prefix@
5	top_builddir = @top_builddir@	5	top_builddir = @top_builddir@
6	top_srcdir = @top_srcdir@	6	top_srcdir = @top_srcdir@
7	-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples	7	-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples

Lines 12-20 Link Here

(-)files/patch-uri.c (-3 / +3 lines)
12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be	12	(e.g. "urx:b:b" becomes "urx://b%3Ab" where "urx:b%3Ab" would be
13	correct)	13	correct)
14		14
15	--- uri.c.orig 2014-10-03 13:28:06.000000000 +0200	15	--- uri.c.orig 2016-05-22 01:49:02 UTC
16	+++ uri.c 2014-10-20 14:22:57.677231158 +0200	16	+++ uri.c
17	@@ -1198,6 +1198,8 @@	17	@@ -1199,6 +1199,8 @@ xmlSaveUri(xmlURIPtr uri) {
18	if (temp == NULL) goto mem_error;	18	if (temp == NULL) goto mem_error;
19	ret = temp;	19	ret = temp;
20	}	20	}

Lines 1-5 Link Here

(-)files/patch-xml2Conf.sh.in (-2 / +2 lines)
1	--- xml2Conf.sh.in 2001/05/19 19:57:43 1.1	1	--- xml2Conf.sh.in.orig 2009-07-30 15:24:35 UTC
2	+++ xml2Conf.sh.in 2001/05/19 19:59:40	2	+++ xml2Conf.sh.in
3	@@ -1,6 +1,12 @@	3	@@ -1,6 +1,12 @@
4	#	4	#
5	# Configuration file for using the XML library in GNOME applications	5	# Configuration file for using the XML library in GNOME applications

Return to bug 222580

Line 0 Link Here

(-)files/LICENSE.TRIO (+12 lines)
	1	(Following sentences are gotten from trio.c of source archive.)
	2
	3	Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
	4
	5	Permission to use, copy, modify, and distribute this software for any
	6	purpose with or without fee is hereby granted, provided that the above
	7	copyright notice and this permission notice appear in all copies.
	8
	9	THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
	10	WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
	11	MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
	12	CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.

Lines 1-7 Link Here

(-)files/patch-Makefile.in (-6 / +6 lines)
1	--- Makefile.in.orig 2014-10-17 20:26:52.547793054 +0200	1	--- Makefile.in.orig 2017-09-20 18:23:56 UTC
2	+++ Makefile.in 2014-10-17 20:27:34.868791352 +0200	2	+++ Makefile.in
3	@@ -1234,7 +1234,7 @@	3	@@ -1245,7 +1245,7 @@ distclean-compile:
4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`	4	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
5		5
6	.c.lo:	6	.c.lo:
7	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<	7	-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Lines 9-15 Link Here
9	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo	9	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Plo
10	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@	10	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
11	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@	11	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
12	@@ -1712,7 +1712,7 @@	12	@@ -1730,7 +1730,7 @@ distcleancheck: distclean
13	check-am: all-am	13	check-am: all-am
14	check: $(BUILT_SOURCES)	14	check: $(BUILT_SOURCES)
15	$(MAKE) $(AM_MAKEFLAGS) check-recursive	15	$(MAKE) $(AM_MAKEFLAGS) check-recursive
Lines 18-24 Link Here
18	config.h	18	config.h
19	install-binPROGRAMS: install-libLTLIBRARIES	19	install-binPROGRAMS: install-libLTLIBRARIES
20		20
21	@@ -1780,7 +1780,7 @@	21	@@ -1798,7 +1798,7 @@ info: info-recursive
22		22
23	info-am:	23	info-am:
24		24

Lines 7-13 Link Here

(-)files/patch-d8083bf (-21 / +10 lines)
7	- Add sanity check for empty stack.	7	- Add sanity check for empty stack.
8		8
9	Found with afl-fuzz.	9	Found with afl-fuzz.
10	---	10	--- result/XPath/xptr/viderror.orig 2017-09-20 18:23:56 UTC
		11	+++ result/XPath/xptr/viderror
		12	@@ -0,0 +1,4 @@
		13	+
		14	+========================
		15	+Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
		16	+Object is empty (NULL)
11	result/XPath/xptr/viderror \| 4 ++++	17	result/XPath/xptr/viderror \| 4 ++++
12	test/XPath/xptr/viderror \| 1 +	18	test/XPath/xptr/viderror \| 1 +
13	xpath.c \| 7 ++++++-	19	xpath.c \| 7 ++++++-
Lines 15-42 Link Here
15	create mode 100644 result/XPath/xptr/viderror	21	create mode 100644 result/XPath/xptr/viderror
16	create mode 100644 test/XPath/xptr/viderror	22	create mode 100644 test/XPath/xptr/viderror
17		23
18	diff --git a/result/XPath/xptr/viderror b/result/XPath/xptr/viderror
19	new file mode 100644	24	new file mode 100644
20	index 0000000..d589882	25	--- test/XPath/xptr/viderror.orig 2017-09-20 18:23:56 UTC
21	--- /dev/null
22	+++ result/XPath/xptr/viderror
23	@@ -0,0 +1,4 @@
24	+
25	+========================
26	+Expression: xpointer(non-existing-fn()/range-to(id('chapter2')))
27	+Object is empty (NULL)
28	diff --git a/test/XPath/xptr/viderror b/test/XPath/xptr/viderror
29	new file mode 100644
30	index 0000000..da8c53b
31	--- /dev/null
32	+++ test/XPath/xptr/viderror	26	+++ test/XPath/xptr/viderror
33	@@ -0,0 +1 @@	27	@@ -0,0 +1 @@
34	+xpointer(non-existing-fn()/range-to(id('chapter2')))	28	+xpointer(non-existing-fn()/range-to(id('chapter2')))
35	diff --git a/xpath.c b/xpath.c	29	--- xpath.c.orig 2016-05-23 07:25:25 UTC
36	index 113bce6..751665b 100644
37	--- xpath.c
38	+++ xpath.c	30	+++ xpath.c
39	@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op)	31	@@ -14005,9 +14005,14 @@ xmlXPathCompOpEval(xmlXPathParserContext
40	xmlNodeSetPtr oldset;	32	xmlNodeSetPtr oldset;
41	int i, j;	33	int i, j;
42		34
Lines 52-57 Link Here
52	if (op->ch2 == -1)	44	if (op->ch2 == -1)
53	return (total);	45	return (total);
54		46
55	--
56	cgit v0.12
57