vendor/expat: import 2.6.3 - src - FreeBSD source tree

diff options


context:
space:
mode:

author	Enji Cooper <ngie@FreeBSD.org>	2024-09-28 03:21:31 +0000
committer	Enji Cooper <ngie@FreeBSD.org>	2024-09-28 03:21:31 +0000
commit	8e1eae2319cd3a651941c88b46d95e8ee8507c6c (patch)
tree	c7f86e4dc2cdf1e500c5b896da8a0d97b52fbfee /lib
parent	345cf360f8b824329558275653518e5f514627ac (diff)

vendor/expat/2.6.3

Diffstat (limited to 'lib')

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

6 files changed, 135 insertions, 61 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0e0185b59120..1958f322f319 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am

@@ -6,7 +6,7 @@

# \___/_/\_\ .__/ \__,_|\__|

# |_| XML parser

# Licensed under the MIT license:

@@ -36,7 +36,9 @@ include_HEADERS = \

expat_external.h

lib_LTLIBRARIES = libexpat.la

-noinst_LTLIBRARIES = libexpatinternal.la

+if WITH_TESTS

+noinst_LTLIBRARIES = libtestpat.la

+endif

libexpat_la_LDFLAGS = \

@AM_LDFLAGS@ \

@@ -44,17 +46,16 @@ libexpat_la_LDFLAGS = \

-no-undefined \

-version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@

-libexpat_la_SOURCES =

-# This layer of indirection allows

-# the test suite to access internal symbols

-# despite compiling with -fvisibility=hidden

-libexpatinternal_la_SOURCES = \

+libexpat_la_SOURCES = \

xmlparse.c \

xmltok.c \

xmlrole.c

-libexpat_la_LIBADD = libexpatinternal.la

+if WITH_TESTS

+libtestpat_la_CPPFLAGS = -DXML_TESTING

+libtestpat_la_SOURCES = $(libexpat_la_SOURCES)

+endif

doc_DATA = \

../AUTHORS \

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 29584d8bbe74..1a97e85fc41f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in

@@ -22,7 +22,7 @@

# \___/_/\_\ .__/ \__,_|\__|

# |_| XML parser

# Licensed under the MIT license:

@@ -176,8 +176,8 @@ am__uninstall_files_from_dir = { \

am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \

"$(DESTDIR)$(includedir)"

LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

-libexpat_la_DEPENDENCIES = libexpatinternal.la

-am_libexpat_la_OBJECTS =

+libexpat_la_LIBADD =

+am_libexpat_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo

libexpat_la_OBJECTS = $(am_libexpat_la_OBJECTS)

AM_V_lt = $(am__v_lt_@AM_V@)

am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

@@ -186,9 +186,13 @@ am__v_lt_1 =

libexpat_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \

$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

$(libexpat_la_LDFLAGS) $(LDFLAGS) -o $@

-libexpatinternal_la_LIBADD =

-am_libexpatinternal_la_OBJECTS = xmlparse.lo xmltok.lo xmlrole.lo

-libexpatinternal_la_OBJECTS = $(am_libexpatinternal_la_OBJECTS)

+libtestpat_la_LIBADD =

+am__libtestpat_la_SOURCES_DIST = xmlparse.c xmltok.c xmlrole.c

+am__objects_1 = libtestpat_la-xmlparse.lo libtestpat_la-xmltok.lo \

+ libtestpat_la-xmlrole.lo

+@WITH_TESTS_TRUE@am_libtestpat_la_OBJECTS = $(am__objects_1)

+libtestpat_la_OBJECTS = $(am_libtestpat_la_OBJECTS)

+@WITH_TESTS_TRUE@am_libtestpat_la_rpath =

AM_V_P = $(am__v_P_@AM_V@)

am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

am__v_P_0 = false

@@ -204,8 +208,10 @@ am__v_at_1 =

DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)

depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp

am__maybe_remake_depfiles = depfiles

-am__depfiles_remade = ./$(DEPDIR)/xmlparse.Plo ./$(DEPDIR)/xmlrole.Plo \

- ./$(DEPDIR)/xmltok.Plo

+am__depfiles_remade = ./$(DEPDIR)/libtestpat_la-xmlparse.Plo \

+ ./$(DEPDIR)/libtestpat_la-xmlrole.Plo \

+ ./$(DEPDIR)/libtestpat_la-xmltok.Plo ./$(DEPDIR)/xmlparse.Plo \

+ ./$(DEPDIR)/xmlrole.Plo ./$(DEPDIR)/xmltok.Plo

am__mv = mv -f

COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

@@ -225,8 +231,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)

am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)

am__v_CCLD_0 = @echo " CCLD " $@;

am__v_CCLD_1 =

-SOURCES = $(libexpat_la_SOURCES) $(libexpatinternal_la_SOURCES)

-DIST_SOURCES = $(libexpat_la_SOURCES) $(libexpatinternal_la_SOURCES)

+SOURCES = $(libexpat_la_SOURCES) $(libtestpat_la_SOURCES)

+DIST_SOURCES = $(libexpat_la_SOURCES) \

+ $(am__libtestpat_la_SOURCES_DIST)

am__can_run_installinfo = \

case $$AM_UPDATE_INFO_DIR in \

n|no|NO) false;; \

@@ -344,6 +351,7 @@ RANLIB = @RANLIB@

SED = @SED@

SET_MAKE = @SET_MAKE@

SHELL = @SHELL@

+SIZEOF_VOID_P = @SIZEOF_VOID_P@

SO_MAJOR = @SO_MAJOR@

SO_MINOR = @SO_MINOR@

SO_PATCH = @SO_PATCH@

@@ -357,7 +365,6 @@ ac_ct_AR = @ac_ct_AR@

ac_ct_CC = @ac_ct_CC@

ac_ct_CXX = @ac_ct_CXX@

ac_ct_DUMPBIN = @ac_ct_DUMPBIN@

-ac_cv_sizeof_void_p = @ac_cv_sizeof_void_p@

am__include = @am__include@

am__leading_dot = @am__leading_dot@

am__quote = @am__quote@

@@ -410,24 +417,20 @@ include_HEADERS = \

expat_external.h

lib_LTLIBRARIES = libexpat.la

-noinst_LTLIBRARIES = libexpatinternal.la

+@WITH_TESTS_TRUE@noinst_LTLIBRARIES = libtestpat.la

libexpat_la_LDFLAGS = \

@AM_LDFLAGS@ \

@LIBM@ \

-no-undefined \

-version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@

-libexpat_la_SOURCES =

-# This layer of indirection allows

-# the test suite to access internal symbols

-# despite compiling with -fvisibility=hidden

-libexpatinternal_la_SOURCES = \

+libexpat_la_SOURCES = \

xmlparse.c \

xmltok.c \

xmlrole.c

-libexpat_la_LIBADD = libexpatinternal.la

+@WITH_TESTS_TRUE@libtestpat_la_CPPFLAGS = -DXML_TESTING

+@WITH_TESTS_TRUE@libtestpat_la_SOURCES = $(libexpat_la_SOURCES)

doc_DATA = \

../AUTHORS \

../Changes

@@ -534,8 +537,8 @@ clean-noinstLTLIBRARIES:

libexpat.la: $(libexpat_la_OBJECTS) $(libexpat_la_DEPENDENCIES) $(EXTRA_libexpat_la_DEPENDENCIES)

$(AM_V_CCLD)$(libexpat_la_LINK) -rpath $(libdir) $(libexpat_la_OBJECTS) $(libexpat_la_LIBADD) $(LIBS)

-libexpatinternal.la: $(libexpatinternal_la_OBJECTS) $(libexpatinternal_la_DEPENDENCIES) $(EXTRA_libexpatinternal_la_DEPENDENCIES)

- $(AM_V_CCLD)$(LINK) $(libexpatinternal_la_OBJECTS) $(libexpatinternal_la_LIBADD) $(LIBS)

+libtestpat.la: $(libtestpat_la_OBJECTS) $(libtestpat_la_DEPENDENCIES) $(EXTRA_libtestpat_la_DEPENDENCIES)

+ $(AM_V_CCLD)$(LINK) $(am_libtestpat_la_rpath) $(libtestpat_la_OBJECTS) $(libtestpat_la_LIBADD) $(LIBS)

mostlyclean-compile:

-rm -f *.$(OBJEXT)

@@ -543,6 +546,9 @@ mostlyclean-compile:

distclean-compile:

-rm -f *.tab.c

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlparse.Plo@am__quote@ # am--include-marker

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmlrole.Plo@am__quote@ # am--include-marker

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtestpat_la-xmltok.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlparse.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmlrole.Plo@am__quote@ # am--include-marker

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmltok.Plo@am__quote@ # am--include-marker

@@ -574,6 +580,27 @@ am--depfiles: $(am__depfiles_remade)

@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<

+libtestpat_la-xmlparse.lo: xmlparse.c

+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-xmlparse.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-xmlparse.Tpo -c -o libtestpat_la-xmlparse.lo `test -f 'xmlparse.c' || echo '$(srcdir)/'`xmlparse.c

+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-xmlparse.Tpo $(DEPDIR)/libtestpat_la-xmlparse.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlparse.c' object='libtestpat_la-xmlparse.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-xmlparse.lo `test -f 'xmlparse.c' || echo '$(srcdir)/'`xmlparse.c

+libtestpat_la-xmltok.lo: xmltok.c

+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-xmltok.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-xmltok.Tpo -c -o libtestpat_la-xmltok.lo `test -f 'xmltok.c' || echo '$(srcdir)/'`xmltok.c

+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-xmltok.Tpo $(DEPDIR)/libtestpat_la-xmltok.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmltok.c' object='libtestpat_la-xmltok.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-xmltok.lo `test -f 'xmltok.c' || echo '$(srcdir)/'`xmltok.c

+libtestpat_la-xmlrole.lo: xmlrole.c

+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libtestpat_la-xmlrole.lo -MD -MP -MF $(DEPDIR)/libtestpat_la-xmlrole.Tpo -c -o libtestpat_la-xmlrole.lo `test -f 'xmlrole.c' || echo '$(srcdir)/'`xmlrole.c

+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtestpat_la-xmlrole.Tpo $(DEPDIR)/libtestpat_la-xmlrole.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xmlrole.c' object='libtestpat_la-xmlrole.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtestpat_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libtestpat_la-xmlrole.lo `test -f 'xmlrole.c' || echo '$(srcdir)/'`xmlrole.c

mostlyclean-libtool:

-rm -f *.lo

@@ -749,7 +776,10 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

clean-noinstLTLIBRARIES mostlyclean-am

distclean: distclean-am

- -rm -f ./$(DEPDIR)/xmlparse.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo

+ -rm -f ./$(DEPDIR)/xmlparse.Plo

-rm -f ./$(DEPDIR)/xmlrole.Plo

-rm -f ./$(DEPDIR)/xmltok.Plo

-rm -f Makefile

@@ -798,7 +828,10 @@ install-ps-am:

installcheck-am:

maintainer-clean: maintainer-clean-am

- -rm -f ./$(DEPDIR)/xmlparse.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmlparse.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmlrole.Plo

+ -rm -f ./$(DEPDIR)/libtestpat_la-xmltok.Plo

+ -rm -f ./$(DEPDIR)/xmlparse.Plo

-rm -f ./$(DEPDIR)/xmlrole.Plo

-rm -f ./$(DEPDIR)/xmltok.Plo

-rm -f Makefile

diff --git a/lib/expat.h b/lib/expat.h
index 95464b0dd177..d0d6015a6628 100644
--- a/lib/expat.h
+++ b/lib/expat.h

@@ -18,6 +18,7 @@

Licensed under the MIT license:

Permission is hereby granted, free of charge, to any person obtaining

@@ -1042,7 +1043,7 @@ typedef struct {

XMLPARSEAPI(const XML_Feature *)

XML_GetFeatureList(void);

-#if XML_GE == 1

+#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)

/* Added in Expat 2.4.0 for XML_DTD defined and

* added in Expat 2.6.0 for XML_GE == 1. */

XMLPARSEAPI(XML_Bool)

@@ -1065,7 +1066,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);

#define XML_MAJOR_VERSION 2

#define XML_MINOR_VERSION 6

-#define XML_MICRO_VERSION 0

+#define XML_MICRO_VERSION 3

#ifdef __cplusplus

}

diff --git a/lib/internal.h b/lib/internal.h
index cce71e4c5164..167ec36804a4 100644
--- a/lib/internal.h
+++ b/lib/internal.h

@@ -28,10 +28,11 @@

Licensed under the MIT license:

Permission is hereby granted, free of charge, to any person obtaining

@@ -155,14 +156,20 @@ extern "C" {

void _INTERNAL_trim_to_complete_utf8_characters(const char *from,

const char **fromLimRef);

-#if XML_GE == 1

+#if defined(XML_GE) && XML_GE == 1

unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);

unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);

const char *unsignedCharToPrintable(unsigned char c);

#endif

-extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c

-extern unsigned int g_parseAttempts; // used for testing only

+extern

+#if ! defined(XML_TESTING)

+ const

+#endif

+ XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c

+#if defined(XML_TESTING)

+extern unsigned int g_bytesScanned; // used for testing only

+#endif

#ifdef __cplusplus

}

diff --git a/lib/siphash.h b/lib/siphash.h
index a1ed99e687bd..04f6f74585b5 100644
--- a/lib/siphash.h
+++ b/lib/siphash.h

@@ -126,8 +126,7 @@

| ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) \

| ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))

-#define SIPHASH_INITIALIZER \

- { 0, 0, 0, 0, {0}, 0, 0 }

+#define SIPHASH_INITIALIZER {0, 0, 0, 0, {0}, 0, 0}

struct siphash {

uint64_t v0, v1, v2, v3;

diff --git a/lib/xmlparse.c b/lib/xmlparse.c
index aaf0fa9c8f96..d9285b213b38 100644
--- a/lib/xmlparse.c
+++ b/lib/xmlparse.c

@@ -1,4 +1,4 @@

-/* 628e24d4966bedbd4800f6ed128d06d29703765b4bce12d3b7f099f90f842fc9 (2.6.0+)

+/* ba4cdf9bdb534f355a9def4c9e25d20ee8e72f95b0a4d930be52e563f5080196 (2.6.3+)

__ __ _

___\ \/ /_ __ __ _| |_

/ _ \\ /| '_ \ / _` | __|

@@ -38,7 +38,8 @@

Licensed under the MIT license:

Permission is hereby granted, free of charge, to any person obtaining

@@ -210,7 +211,7 @@ typedef char ICHAR;

#endif

/* Round up n to be a multiple of sz, where sz is a power of 2. */

-#define ROUND_UP(n, sz) (((n) + ((sz)-1)) & ~((sz)-1))

+#define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1))

/* Do safe (NULL-aware) pointer arithmetic */

#define EXPAT_SAFE_PTR_DIFF(p, q) (((p) && (q)) ? ((p) - (q)) : 0)

@@ -248,7 +249,7 @@ static void copy_salt_to_sipkey(XML_Parser parser, struct sipkey *key);

it odd, since odd numbers are always relative prime to a power of 2.

#define SECOND_HASH(hash, mask, power) \

- ((((hash) & ~(mask)) >> ((power)-1)) & ((mask) >> 2))

+ ((((hash) & ~(mask)) >> ((power) - 1)) & ((mask) >> 2))

#define PROBE_STEP(hash, mask, power) \

((unsigned char)((SECOND_HASH(hash, mask, power)) | 1))

@@ -294,7 +295,7 @@ typedef struct {

The name of the element is stored in both the document and API

encodings. The memory buffer 'buf' is a separately-allocated

memory area which stores the name. During the XML_Parse()/

- XMLParseBuffer() when the element is open, the memory for the 'raw'

+ XML_ParseBuffer() when the element is open, the memory for the 'raw'

version of the name (in the document encoding) is shared with the

document buffer. If the element is open across calls to

XML_Parse()/XML_ParseBuffer(), the buffer is re-allocated to

@@ -629,8 +630,14 @@ static unsigned long getDebugLevel(const char *variableName,

? 0 \

: ((*((pool)->ptr)++ = c), 1))

-XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c

-unsigned int g_parseAttempts = 0; // used for testing only

+#if ! defined(XML_TESTING)

+const

+#endif

+ XML_Bool g_reparseDeferralEnabledDefault

+ = XML_TRUE; // write ONLY in runtests.c

+#if defined(XML_TESTING)

+unsigned int g_bytesScanned = 0; // used for testing only

+#endif

struct XML_ParserStruct {

/* The first member must be m_userData so that the XML_GetUserData

@@ -1017,7 +1024,9 @@ callProcessor(XML_Parser parser, const char *start, const char *end,

return XML_ERROR_NONE;

}

- g_parseAttempts += 1;

+#if defined(XML_TESTING)

+ g_bytesScanned += (unsigned)have_now;

+#endif

const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr);

if (ret == XML_ERROR_NONE) {

// if we consumed nothing, remember what we had on this parse attempt.

@@ -2030,6 +2039,12 @@ XML_ParseBuffer(XML_Parser parser, int len, int isFinal) {

if (parser == NULL)

return XML_STATUS_ERROR;

+ if (len < 0) {

+ parser->m_errorCode = XML_ERROR_INVALID_ARGUMENT;

+ return XML_STATUS_ERROR;

+ }

switch (parser->m_parsingStatus.parsing) {

case XML_SUSPENDED:

parser->m_errorCode = XML_ERROR_SUSPENDED;

@@ -5838,18 +5853,17 @@ processInternalEntity(XML_Parser parser, ENTITY *entity, XML_Bool betweenDecl) {

/* Set a safe default value in case 'next' does not get set */

next = textStart;

-#ifdef XML_DTD

if (entity->is_param) {

int tok

= XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);

result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,

tok, next, &next, XML_FALSE, XML_FALSE,

XML_ACCOUNT_ENTITY_EXPANSION);

- } else

-#endif /* XML_DTD */

+ } else {

result = doContent(parser, parser->m_tagLevel, parser->m_internalEncoding,

textStart, textEnd, &next, XML_FALSE,

XML_ACCOUNT_ENTITY_EXPANSION);

+ }

if (result == XML_ERROR_NONE) {

if (textEnd != next && parser->m_parsingStatus.parsing == XML_SUSPENDED) {

@@ -5886,18 +5900,17 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,

/* Set a safe default value in case 'next' does not get set */

next = textStart;

-#ifdef XML_DTD

if (entity->is_param) {

int tok

= XmlPrologTok(parser->m_internalEncoding, textStart, textEnd, &next);

result = doProlog(parser, parser->m_internalEncoding, textStart, textEnd,

tok, next, &next, XML_FALSE, XML_TRUE,

XML_ACCOUNT_ENTITY_EXPANSION);

- } else

-#endif /* XML_DTD */

+ } else {

result = doContent(parser, openEntity->startTagLevel,

parser->m_internalEncoding, textStart, textEnd, &next,

XML_FALSE, XML_ACCOUNT_ENTITY_EXPANSION);

+ }

if (result != XML_ERROR_NONE)

return result;

@@ -5924,7 +5937,6 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,

return XML_ERROR_NONE;

}

-#ifdef XML_DTD

if (entity->is_param) {

int tok;

parser->m_processor = prologProcessor;

@@ -5932,9 +5944,7 @@ internalEntityProcessor(XML_Parser parser, const char *s, const char *end,

return doProlog(parser, parser->m_encoding, s, end, tok, next, nextPtr,

(XML_Bool)! parser->m_parsingStatus.finalBuffer, XML_TRUE,

XML_ACCOUNT_DIRECT);

- } else

-#endif /* XML_DTD */

- {

+ } else {

parser->m_processor = contentProcessor;

/* see externalEntityContentProcessor vs contentProcessor */

result = doContent(parser, parser->m_parentParser ? 1 : 0,

@@ -6232,7 +6242,7 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc,

dtd->keepProcessing = dtd->standalone;

goto endEntityValue;

}

- if (entity->open) {

+ if (entity->open || (entity == parser->m_declEntity)) {

if (enc == parser->m_encoding)

parser->m_eventPtr = entityTextPtr;

result = XML_ERROR_RECURSIVE_ENTITY_REF;

@@ -7008,6 +7018,16 @@ dtdCopy(XML_Parser oldParser, DTD *newDtd, const DTD *oldDtd,

if (! newE)

return 0;

if (oldE->nDefaultAtts) {

+ /* Detect and prevent integer overflow.

+ * The preprocessor guard addresses the "always false" warning

+ * from -Wtype-limits on platforms where

+ * sizeof(int) < sizeof(size_t), e.g. on x86_64. */

+#if UINT_MAX >= SIZE_MAX

+ if ((size_t)oldE->nDefaultAtts

+ > ((size_t)(-1) / sizeof(DEFAULT_ATTRIBUTE))) {

+ return 0;

+ }

+#endif

newE->defaultAtts

= ms->malloc_fcn(oldE->nDefaultAtts * sizeof(DEFAULT_ATTRIBUTE));

if (! newE->defaultAtts) {

@@ -7550,6 +7570,15 @@ nextScaffoldPart(XML_Parser parser) {

int next;

if (! dtd->scaffIndex) {

+ /* Detect and prevent integer overflow.

+ * The preprocessor guard addresses the "always false" warning

+ * from -Wtype-limits on platforms where

+ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */

+#if UINT_MAX >= SIZE_MAX

+ if (parser->m_groupSize > ((size_t)(-1) / sizeof(int))) {

+ return -1;

+ }

+#endif

dtd->scaffIndex = (int *)MALLOC(parser, parser->m_groupSize * sizeof(int));

if (! dtd->scaffIndex)

return -1;

@@ -7779,6 +7808,8 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) {

static float

accountingGetCurrentAmplification(XML_Parser rootParser) {

+ // 1.........1.........12 => 22

+ const size_t lenOfShortestInclude = sizeof("<!ENTITY a SYSTEM 'b'>") - 1;

const XmlBigCount countBytesOutput

= rootParser->m_accounting.countBytesDirect

+ rootParser->m_accounting.countBytesIndirect;

@@ -7786,7 +7817,9 @@ accountingGetCurrentAmplification(XML_Parser rootParser) {

= rootParser->m_accounting.countBytesDirect

? (countBytesOutput

/ (float)(rootParser->m_accounting.countBytesDirect))

- : 1.0f;

+ : ((lenOfShortestInclude

+ + rootParser->m_accounting.countBytesIndirect)

+ / (float)lenOfShortestInclude);

assert(! rootParser->m_parentParser);

return amplificationFactor;

}