src - FreeBSD source tree

diff options


context:
space:
mode:

author	Eric van Gyzen <vangyzen@FreeBSD.org>	2018-11-02 22:10:07 +0000
committer	Eric van Gyzen <vangyzen@FreeBSD.org>	2018-11-02 22:10:07 +0000
commit	77c85705a616126682be274fd54e9c4308083501 (patch)
tree	a02e6dd407e533d1d1cab88ead33a499d9291ae4 /tests/runtests.c
parent	17c9c52d9a57f24fdf6202e339e7a713e97d27bb (diff)

Vendor import of expat 2.2.6vendor/expat/2.2.6

Sponsored by: Dell EMC Isilon

Notes

Notes: svn path=/vendor/expat/dist/; revision=340084 svn path=/vendor/expat/2.2.6/; revision=340085; tag=vendor/expat/2.2.6

Diffstat (limited to 'tests/runtests.c')

-rw-r--r--

tests/runtests.c

11195

1 files changed, 10932 insertions, 263 deletions

diff --git a/tests/runtests.c b/tests/runtests.c
index c0cdea997548..4f4d2687f113 100644
--- a/tests/runtests.c
+++ b/tests/runtests.c

@@ -1,39 +1,116 @@

- See the file COPYING for copying permission.

- runtest.c : run the Expat test suite

+/* Run the Expat test suite

+ __ __ _

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

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

+ | __// \| |_) | (_| | |_

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

+ |_| XML parser

+ Licensed under the MIT license:

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

+ a copy of this software and associated documentation files (the

+ "Software"), to deal in the Software without restriction, including

+ without limitation the rights to use, copy, modify, merge, publish,

+ distribute, sublicense, and/or sell copies of the Software, and to permit

+ persons to whom the Software is furnished to do so, subject to the

+ following conditions:

+ The above copyright notice and this permission notice shall be included

+ in all copies or substantial portions of the Software.

+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN

+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,

+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

+ USE OR OTHER DEALINGS IN THE SOFTWARE.

+#if defined(NDEBUG)

+# undef NDEBUG /* because test suite relies on assert(...) at the moment */

+#endif

#ifdef HAVE_EXPAT_CONFIG_H

-#include <expat_config.h>

+# include <expat_config.h>

#endif

#include <assert.h>

#include <stdlib.h>

#include <stdio.h>

#include <string.h>

-#include <stdint.h>

#include <stddef.h> /* ptrdiff_t */

-#ifndef __cplusplus

-# include <stdbool.h>

+#include <ctype.h>

+#include <limits.h>

+#if defined(_WIN32) && defined(_MSC_VER) && (_MSC_VER < 1600)

+ /* For vs2003/7.1 up to vs2008/9.0; _MSC_VER 1600 is vs2010/10.0 */

+ #if defined(_WIN64)

+ typedef __int64 intptr_t;

+ #else

+ typedef __int32 intptr_t;

+ #endif

+ typedef unsigned __int64 uint64_t;

+#else

+ #include <stdint.h> /* intptr_t uint64_t */

+#endif

+#if ! defined(__cplusplus)

+# if defined(_MSC_VER) && (_MSC_VER <= 1700)

+ /* for vs2012/11.0/1700 and earlier Visual Studio compilers */

+# define bool int

+# define false 0

+# define true 1

+# else

+# include <stdbool.h>

+# endif

#endif

#include "expat.h"

#include "chardata.h"

+#include "structdata.h"

#include "internal.h" /* for UNUSED_P only */

#include "minicheck.h"

-#if defined(__amigaos__) && defined(__USE_INLINE__)

-#include <proto/expat.h>

-#endif

+#include "memcheck.h"

+#include "siphash.h"

+#include "ascii.h" /* for ASCII_xxx */

#ifdef XML_LARGE_SIZE

-#define XML_FMT_INT_MOD "ll"

+# define XML_FMT_INT_MOD "ll"

#else

-#define XML_FMT_INT_MOD "l"

+# define XML_FMT_INT_MOD "l"

#endif

-static XML_Parser parser;

+#ifdef XML_UNICODE_WCHAR_T

+# define XML_FMT_CHAR "lc"

+# define XML_FMT_STR "ls"

+# include <wchar.h>

+# define xcstrlen(s) wcslen(s)

+# define xcstrcmp(s, t) wcscmp((s), (t))

+# define xcstrncmp(s, t, n) wcsncmp((s), (t), (n))

+# define XCS(s) _XCS(s)

+# define _XCS(s) L ## s

+#else

+# ifdef XML_UNICODE

+# error "No support for UTF-16 character without wchar_t in tests"

+# else

+# define XML_FMT_CHAR "c"

+# define XML_FMT_STR "s"

+# define xcstrlen(s) strlen(s)

+# define xcstrcmp(s, t) strcmp((s), (t))

+# define xcstrncmp(s, t, n) strncmp((s), (t), (n))

+# define XCS(s) s

+# endif /* XML_UNICODE */

+#endif /* XML_UNICODE_WCHAR_T */

+static XML_Parser parser = NULL;

static void

@@ -47,8 +124,10 @@ basic_setup(void)

static void

basic_teardown(void)

{

- if (parser != NULL)

+ if (parser != NULL) {

XML_ParserFree(parser);

+ parser = NULL;

+ }

}

/* Generate a failure using the parser state to create an error message;

@@ -61,7 +140,8 @@ _xml_failure(XML_Parser parser, const char *file, int line)

char buffer[1024];

enum XML_Error err = XML_GetErrorCode(parser);

sprintf(buffer,

- " %d: %s (line %" XML_FMT_INT_MOD "u, offset %"\

+ " %d: %" XML_FMT_STR " (line %"

+ XML_FMT_INT_MOD "u, offset %"

XML_FMT_INT_MOD "u)\n reported from %s, line %d\n",

err,

XML_ErrorString(err),

@@ -98,7 +178,7 @@ static void

_expect_failure(const char *text, enum XML_Error errorCode, const char *errorMessage,

const char *file, int lineno)

{

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_OK)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_OK)

/* Hackish use of _fail_unless() macro, but let's us report

the right filename and line number. */

_fail_unless(0, file, lineno, errorMessage);

@@ -113,6 +193,34 @@ _expect_failure(const char *text, enum XML_Error errorCode, const char *errorMes

/* Dummy handlers for when we need to set a handler to tickle a bug,

but it doesn't need to do anything.

+static unsigned long dummy_handler_flags = 0;

+#define DUMMY_START_DOCTYPE_HANDLER_FLAG (1UL << 0)

+#define DUMMY_END_DOCTYPE_HANDLER_FLAG (1UL << 1)

+#define DUMMY_ENTITY_DECL_HANDLER_FLAG (1UL << 2)

+#define DUMMY_NOTATION_DECL_HANDLER_FLAG (1UL << 3)

+#define DUMMY_ELEMENT_DECL_HANDLER_FLAG (1UL << 4)

+#define DUMMY_ATTLIST_DECL_HANDLER_FLAG (1UL << 5)

+#define DUMMY_COMMENT_HANDLER_FLAG (1UL << 6)

+#define DUMMY_PI_HANDLER_FLAG (1UL << 7)

+#define DUMMY_START_ELEMENT_HANDLER_FLAG (1UL << 8)

+#define DUMMY_START_CDATA_HANDLER_FLAG (1UL << 9)

+#define DUMMY_END_CDATA_HANDLER_FLAG (1UL << 10)

+#define DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG (1UL << 11)

+#define DUMMY_START_NS_DECL_HANDLER_FLAG (1UL << 12)

+#define DUMMY_END_NS_DECL_HANDLER_FLAG (1UL << 13)

+#define DUMMY_START_DOCTYPE_DECL_HANDLER_FLAG (1UL << 14)

+#define DUMMY_END_DOCTYPE_DECL_HANDLER_FLAG (1UL << 15)

+#define DUMMY_SKIP_HANDLER_FLAG (1UL << 16)

+#define DUMMY_DEFAULT_HANDLER_FLAG (1UL << 17)

+static void XMLCALL

+dummy_xdecl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(version),

+ const XML_Char *UNUSED_P(encoding),

+ int UNUSED_P(standalone))

+{}

static void XMLCALL

dummy_start_doctype_handler(void *UNUSED_P(userData),

@@ -120,11 +228,15 @@ dummy_start_doctype_handler(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(sysid),

const XML_Char *UNUSED_P(pubid),

int UNUSED_P(has_internal_subset))

-{}

+ dummy_handler_flags |= DUMMY_START_DOCTYPE_HANDLER_FLAG;

static void XMLCALL

dummy_end_doctype_handler(void *UNUSED_P(userData))

-{}

+ dummy_handler_flags |= DUMMY_END_DOCTYPE_HANDLER_FLAG;

static void XMLCALL

dummy_entity_decl_handler(void *UNUSED_P(userData),

@@ -136,7 +248,9 @@ dummy_entity_decl_handler(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(systemId),

const XML_Char *UNUSED_P(publicId),

const XML_Char *UNUSED_P(notationName))

-{}

+ dummy_handler_flags |= DUMMY_ENTITY_DECL_HANDLER_FLAG;

static void XMLCALL

dummy_notation_decl_handler(void *UNUSED_P(userData),

@@ -144,13 +258,22 @@ dummy_notation_decl_handler(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(base),

const XML_Char *UNUSED_P(systemId),

const XML_Char *UNUSED_P(publicId))

-{}

+ dummy_handler_flags |= DUMMY_NOTATION_DECL_HANDLER_FLAG;

static void XMLCALL

dummy_element_decl_handler(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(name),

- XML_Content *UNUSED_P(model))

-{}

+ XML_Content *model)

+ /* The content model must be freed by the handler. Unfortunately

+ * we cannot pass the parser as the userData because this is used

+ * with other handlers that require other userData.

+ */

+ XML_FreeContentModel(parser, model);

+ dummy_handler_flags |= DUMMY_ELEMENT_DECL_HANDLER_FLAG;

static void XMLCALL

dummy_attlist_decl_handler(void *UNUSED_P(userData),

@@ -159,21 +282,185 @@ dummy_attlist_decl_handler(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(att_type),

const XML_Char *UNUSED_P(dflt),

int UNUSED_P(isrequired))

-{}

+ dummy_handler_flags |= DUMMY_ATTLIST_DECL_HANDLER_FLAG;

static void XMLCALL

dummy_comment_handler(void *UNUSED_P(userData), const XML_Char *UNUSED_P(data))

-{}

+ dummy_handler_flags |= DUMMY_COMMENT_HANDLER_FLAG;

static void XMLCALL

dummy_pi_handler(void *UNUSED_P(userData), const XML_Char *UNUSED_P(target), const XML_Char *UNUSED_P(data))

-{}

+ dummy_handler_flags |= DUMMY_PI_HANDLER_FLAG;

static void XMLCALL

dummy_start_element(void *UNUSED_P(userData),

const XML_Char *UNUSED_P(name), const XML_Char **UNUSED_P(atts))

+ dummy_handler_flags |= DUMMY_START_ELEMENT_HANDLER_FLAG;

+static void XMLCALL

+dummy_end_element(void *UNUSED_P(userData), const XML_Char *UNUSED_P(name))

+{}

+static void XMLCALL

+dummy_start_cdata_handler(void *UNUSED_P(userData))

+ dummy_handler_flags |= DUMMY_START_CDATA_HANDLER_FLAG;

+static void XMLCALL

+dummy_end_cdata_handler(void *UNUSED_P(userData))

+ dummy_handler_flags |= DUMMY_END_CDATA_HANDLER_FLAG;

+static void XMLCALL

+dummy_cdata_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

{}

+static void XMLCALL

+dummy_start_namespace_decl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(prefix),

+ const XML_Char *UNUSED_P(uri))

+ dummy_handler_flags |= DUMMY_START_NS_DECL_HANDLER_FLAG;

+static void XMLCALL

+dummy_end_namespace_decl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(prefix))

+ dummy_handler_flags |= DUMMY_END_NS_DECL_HANDLER_FLAG;

+/* This handler is obsolete, but while the code exists we should

+ * ensure that dealing with the handler is covered by tests.

+ */

+static void XMLCALL

+dummy_unparsed_entity_decl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(entityName),

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId),

+ const XML_Char *UNUSED_P(notationName))

+ dummy_handler_flags |= DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG;

+static void XMLCALL

+dummy_default_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

+{}

+static void XMLCALL

+dummy_start_doctype_decl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(doctypeName),

+ const XML_Char *UNUSED_P(sysid),

+ const XML_Char *UNUSED_P(pubid),

+ int UNUSED_P(has_internal_subset))

+ dummy_handler_flags |= DUMMY_START_DOCTYPE_DECL_HANDLER_FLAG;

+static void XMLCALL

+dummy_end_doctype_decl_handler(void *UNUSED_P(userData))

+ dummy_handler_flags |= DUMMY_END_DOCTYPE_DECL_HANDLER_FLAG;

+static void XMLCALL

+dummy_skip_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(entityName),

+ int UNUSED_P(is_parameter_entity))

+ dummy_handler_flags |= DUMMY_SKIP_HANDLER_FLAG;

+/* Useful external entity handler */

+typedef struct ExtOption {

+ const XML_Char *system_id;

+ const char *parse_text;

+} ExtOption;

+static int XMLCALL

+external_entity_optioner(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ ExtOption *options = (ExtOption *)XML_GetUserData(parser);

+ XML_Parser ext_parser;

+ while (options->parse_text != NULL) {

+ if (!xcstrcmp(systemId, options->system_id)) {

+ enum XML_Status rc;

+ ext_parser =

+ XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ return XML_STATUS_ERROR;

+ rc = _XML_Parse_SINGLE_BYTES(ext_parser, options->parse_text,

+ (int)strlen(options->parse_text),

+ XML_TRUE);

+ XML_ParserFree(ext_parser);

+ return rc;

+ }

+ options++;

+ }

+ fail("No suitable option found");

+ return XML_STATUS_ERROR;

+/*

+ * Parameter entity evaluation support.

+ */

+#define ENTITY_MATCH_FAIL (-1)

+#define ENTITY_MATCH_NOT_FOUND (0)

+#define ENTITY_MATCH_SUCCESS (1)

+static const XML_Char *entity_name_to_match = NULL;

+static const XML_Char *entity_value_to_match = NULL;

+static int entity_match_flag = ENTITY_MATCH_NOT_FOUND;

+static void XMLCALL

+param_entity_match_handler(void *UNUSED_P(userData),

+ const XML_Char *entityName,

+ int is_parameter_entity,

+ const XML_Char *value,

+ int value_length,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId),

+ const XML_Char *UNUSED_P(notationName))

+ if (!is_parameter_entity ||

+ entity_name_to_match == NULL ||

+ entity_value_to_match == NULL) {

+ return;

+ }

+ if (!xcstrcmp(entityName, entity_name_to_match)) {

+ /* The cast here is safe because we control the horizontal and

+ * the vertical, and we therefore know our strings are never

+ * going to overflow an int.

+ */

+ if (value_length != (int)xcstrlen(entity_value_to_match) ||

+ xcstrncmp(value, entity_value_to_match, value_length)) {

+ entity_match_flag = ENTITY_MATCH_FAIL;

+ } else {

+ entity_match_flag = ENTITY_MATCH_SUCCESS;

+ }

+ /* Else leave the match flag alone */

* Character & encoding tests.

@@ -201,12 +488,50 @@ START_TEST(test_u0000_char)

}

END_TEST

+START_TEST(test_siphash_self)

+ if (! sip24_valid())

+ fail("SipHash self-test failed");

+END_TEST

+START_TEST(test_siphash_spec)

+ /* https://131002.net/siphash/siphash.pdf (page 19, "Test values") */

+ const char message[] = "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09"

+ "\x0a\x0b\x0c\x0d\x0e";

+ const size_t len = sizeof(message) - 1;

+ const uint64_t expected = _SIP_ULL(0xa129ca61U, 0x49be45e5U);

+ struct siphash state;

+ struct sipkey key;

+ sip_tokey(&key,

+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09"

+ "\x0a\x0b\x0c\x0d\x0e\x0f");

+ sip24_init(&state, &key);

+ /* Cover spread across calls */

+ sip24_update(&state, message, 4);

+ sip24_update(&state, message + 4, len - 4);

+ /* Cover null length */

+ sip24_update(&state, message, 0);

+ if (sip24_final(&state) != expected)

+ fail("sip24_final failed spec test\n");

+ /* Cover wrapper */

+ if (siphash24(message, len, &key) != expected)

+ fail("siphash24 failed spec test\n");

+END_TEST

START_TEST(test_bom_utf8)

{

/* This test is really just making sure we don't core on a UTF-8 BOM. */

const char *text = "\357\273\277<e/>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -229,6 +554,16 @@ START_TEST(test_bom_utf16_le)

}

END_TEST

+/* Parse whole buffer at once to exercise a different code path */

+START_TEST(test_nobom_utf16_le)

+ char text[] = " \0<\0e\0/\0>\0";

+ if (XML_Parse(parser, text, sizeof(text)-1, XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

static void XMLCALL

accumulate_characters(void *userData, const XML_Char *s, int len)

{

@@ -240,15 +575,21 @@ accumulate_attribute(void *userData, const XML_Char *UNUSED_P(name),

const XML_Char **atts)

{

CharData *storage = (CharData *)userData;

- if (storage->count < 0 && atts != NULL && atts[0] != NULL) {

+ /* Check there are attributes to deal with */

+ if (atts == NULL)

+ return;

+ while (storage->count < 0 && atts[0] != NULL) {

/* "accumulate" the value of the first attribute we see */

CharData_AppendXMLChars(storage, atts[1], -1);

+ atts += 2;

}

static void

-_run_character_check(const XML_Char *text, const XML_Char *expected,

+_run_character_check(const char *text, const XML_Char *expected,

const char *file, int line)

{

CharData storage;

@@ -256,7 +597,7 @@ _run_character_check(const XML_Char *text, const XML_Char *expected,

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetCharacterDataHandler(parser, accumulate_characters);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

_xml_failure(parser, file, line);

CharData_CheckXMLChars(&storage, expected);

}

@@ -265,7 +606,7 @@ _run_character_check(const XML_Char *text, const XML_Char *expected,

_run_character_check(text, expected, __FILE__, __LINE__)

static void

-_run_attribute_check(const XML_Char *text, const XML_Char *expected,

+_run_attribute_check(const char *text, const XML_Char *expected,

const char *file, int line)

{

CharData storage;

@@ -273,7 +614,7 @@ _run_attribute_check(const XML_Char *text, const XML_Char *expected,

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetStartElementHandler(parser, accumulate_attribute);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

_xml_failure(parser, file, line);

CharData_CheckXMLChars(&storage, expected);

}

@@ -281,14 +622,54 @@ _run_attribute_check(const XML_Char *text, const XML_Char *expected,

#define run_attribute_check(text, expected) \

_run_attribute_check(text, expected, __FILE__, __LINE__)

+typedef struct ExtTest {

+ const char *parse_text;

+ const XML_Char *encoding;

+ CharData *storage;

+} ExtTest;

+static void XMLCALL

+ext_accumulate_characters(void *userData, const XML_Char *s, int len)

+ ExtTest *test_data = (ExtTest *)userData;

+ accumulate_characters(test_data->storage, s, len);

+static void

+_run_ext_character_check(const char *text,

+ ExtTest *test_data,

+ const XML_Char *expected,

+ const char *file, int line)

+ CharData storage;

+ CharData_Init(&storage);

+ test_data->storage = &storage;

+ XML_SetUserData(parser, test_data);

+ XML_SetCharacterDataHandler(parser, ext_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ _xml_failure(parser, file, line);

+ CharData_CheckXMLChars(&storage, expected);

+#define run_ext_character_check(text, test_data, expected) \

+ _run_ext_character_check(text, test_data, expected, __FILE__, __LINE__)

/* Regression test for SF bug #491986. */

START_TEST(test_danish_latin1)

{

const char *text =

"<?xml version='1.0' encoding='iso-8859-1'?>\n"

"<e>J\xF8rgen \xE6\xF8\xE5\xC6\xD8\xC5</e>";

- run_character_check(text,

- "J\xC3\xB8rgen \xC3\xA6\xC3\xB8\xC3\xA5\xC3\x86\xC3\x98\xC3\x85");

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ XCS("J\x00f8rgen \x00e6\x00f8\x00e5\x00c6\x00d8\x00c5");

+#else

+ const XML_Char *expected =

+ XCS("J\xC3\xB8rgen \xC3\xA6\xC3\xB8\xC3\xA5\xC3\x86\xC3\x98\xC3\x85");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -299,8 +680,14 @@ START_TEST(test_french_charref_hexidecimal)

const char *text =

"<?xml version='1.0' encoding='iso-8859-1'?>\n"

"<doc>éèàçêÈ</doc>";

- run_character_check(text,

- "\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ XCS("\x00e9\x00e8\x00e0\x00e7\x00ea\x00c8");

+#else

+ const XML_Char *expected =

+ XCS("\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -309,8 +696,14 @@ START_TEST(test_french_charref_decimal)

const char *text =

"<?xml version='1.0' encoding='iso-8859-1'?>\n"

"<doc>éèàçêÈ</doc>";

- run_character_check(text,

- "\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ XCS("\x00e9\x00e8\x00e0\x00e7\x00ea\x00c8");

+#else

+ const XML_Char *expected =

+ XCS("\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -319,8 +712,14 @@ START_TEST(test_french_latin1)

const char *text =

"<?xml version='1.0' encoding='iso-8859-1'?>\n"

"<doc>\xE9\xE8\xE0\xE7\xEa\xC8</doc>";

- run_character_check(text,

- "\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ XCS("\x00e9\x00e8\x00e0\x00e7\x00ea\x00c8");

+#else

+ const XML_Char *expected =

+ XCS("\xC3\xA9\xC3\xA8\xC3\xA0\xC3\xA7\xC3\xAA\xC3\x88");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -329,7 +728,12 @@ START_TEST(test_french_utf8)

const char *text =

"<?xml version='1.0' encoding='utf-8'?>\n"

"<doc>\xC3\xA9</doc>";

- run_character_check(text, "\xC3\xA9");

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e9");

+#else

+ const XML_Char *expected = XCS("\xC3\xA9");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -341,7 +745,12 @@ END_TEST

START_TEST(test_utf8_false_rejection)

{

const char *text = "<doc>\xEF\xBA\xBF</doc>";

- run_character_check(text, "\xEF\xBA\xBF");

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\xfebf");

+#else

+ const XML_Char *expected = XCS("\xEF\xBA\xBF");

+#endif

+ run_character_check(text, expected);

}

END_TEST

@@ -357,7 +766,7 @@ START_TEST(test_illegal_utf8)

for (i = 128; i <= 255; ++i) {

sprintf(text, "<e>%ccd</e>", i);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_OK) {

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_OK) {

sprintf(text,

"expected token error for '%c' (ordinal %d) in UTF-8 text",

i, i);

@@ -411,15 +820,17 @@ START_TEST(test_utf8_auto_align)

const char * const fromLimInitially = fromLim;

ptrdiff_t actualMovementInChars;

- align_limit_to_full_utf8_characters(cases[i].input, &fromLim);

+ _INTERNAL_trim_to_complete_utf8_characters(cases[i].input, &fromLim);

actualMovementInChars = (fromLim - fromLimInitially);

if (actualMovementInChars != cases[i].expectedMovementInChars) {

size_t j = 0;

success = false;

- printf("[-] UTF-8 case %2lu: Expected movement by %2ld chars"

- ", actually moved by %2ld chars: \"",

- i + 1, cases[i].expectedMovementInChars, actualMovementInChars);

+ printf("[-] UTF-8 case %2u: Expected movement by %2d chars"

+ ", actually moved by %2d chars: \"",

+ (unsigned)(i + 1),

+ (int)cases[i].expectedMovementInChars,

+ (int)actualMovementInChars);

for (; j < strlen(cases[i].input); j++) {

printf("\\x%02x", (unsigned char)cases[i].input[j]);

}

@@ -436,18 +847,31 @@ END_TEST

START_TEST(test_utf16)

{

/* <?xml version="1.0" encoding="UTF-16"?>

- <doc a='123'>some text</doc>

- */

+ * <doc a='123'>some {A} text</doc>

+ *

+ * where {A} is U+FF21, FULLWIDTH LATIN CAPITAL LETTER A

+ */

char text[] =

"\000<\000?\000x\000m\000\154\000 \000v\000e\000r\000s\000i\000o"

"\000n\000=\000'\0001\000.\000\060\000'\000 \000e\000n\000c\000o"

"\000d\000i\000n\000g\000=\000'\000U\000T\000F\000-\0001\000\066"

"\000'\000?\000>\000\n"

- "\000<\000d\000o\000c\000 \000a\000=\000'\0001\0002\0003\000'"

- "\000>\000s\000o\000m\000e\000 \000t\000e\000x\000t\000<\000/"

- "\000d\000o\000c\000>";

+ "\000<\000d\000o\000c\000 \000a\000=\000'\0001\0002\0003\000'\000>"

+ "\000s\000o\000m\000e\000 \xff\x21\000 \000t\000e\000x\000t\000"

+ "<\000/\000d\000o\000c\000>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("some \xff21 text");

+#else

+ const XML_Char *expected = XCS("some \357\274\241 text");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

if (_XML_Parse_SINGLE_BYTES(parser, text, sizeof(text)-1, XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

}

END_TEST

@@ -474,6 +898,34 @@ START_TEST(test_utf16_le_epilog_newline)

}

END_TEST

+/* Test that an outright lie in the encoding is faulted */

+START_TEST(test_not_utf16)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-16'?>"

+ "<doc>Hi</doc>";

+ /* Use a handler to provoke the appropriate code paths */

+ XML_SetXmlDeclHandler(parser, dummy_xdecl_handler);

+ expect_failure(text,

+ XML_ERROR_INCORRECT_ENCODING,

+ "UTF-16 declared in UTF-8 not faulted");

+END_TEST

+/* Test that an unknown encoding is rejected */

+START_TEST(test_bad_encoding)

+ const char *text = "<doc>Hi</doc>";

+ if (!XML_SetEncoding(parser, XCS("unknown-encoding")))

+ fail("XML_SetEncoding failed");

+ expect_failure(text,

+ XML_ERROR_UNKNOWN_ENCODING,

+ "Unknown encoding not faulted");

+END_TEST

/* Regression test for SF bug #481609, #774028. */

START_TEST(test_latin1_umlauts)

{

@@ -481,13 +933,167 @@ START_TEST(test_latin1_umlauts)

"<?xml version='1.0' encoding='iso-8859-1'?>\n"

"<e a='\xE4 \xF6 \xFC ä ö ü ä ö ü >'\n"

" >\xE4 \xF6 \xFC ä ö ü ä ö ü ></e>";

- const char *utf8 =

- "\xC3\xA4 \xC3\xB6 \xC3\xBC "

- "\xC3\xA4 \xC3\xB6 \xC3\xBC >";

- run_character_check(text, utf8);

+#ifdef XML_UNICODE

+ /* Expected results in UTF-16 */

+ const XML_Char *expected =

+ XCS("\x00e4 \x00f6 \x00fc ")

+ XCS("\x00e4 \x00f6 \x00fc >");

+#else

+ /* Expected results in UTF-8 */

+ const XML_Char *expected =

+ XCS("\xC3\xA4 \xC3\xB6 \xC3\xBC ")

+ XCS("\xC3\xA4 \xC3\xB6 \xC3\xBC >");

+#endif

+ run_character_check(text, expected);

XML_ParserReset(parser, NULL);

- run_attribute_check(text, utf8);

+ run_attribute_check(text, expected);

+ /* Repeat with a default handler */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, dummy_default_handler);

+ run_character_check(text, expected);

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, dummy_default_handler);

+ run_attribute_check(text, expected);

+END_TEST

+/* Test that an element name with a 4-byte UTF-8 character is rejected */

+START_TEST(test_long_utf8_character)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ /* 0xf0 0x90 0x80 0x80 = U+10000, the first Linear B character */

+ "<do\xf0\x90\x80\x80/>";

+ expect_failure(text,

+ XML_ERROR_INVALID_TOKEN,

+ "4-byte UTF-8 character in element name not faulted");

+END_TEST

+/* Test that a long latin-1 attribute (too long to convert in one go)

+ * is correctly converted

+ */

+START_TEST(test_long_latin1_attribute)

+ const char *text =

+ "<?xml version='1.0' encoding='iso-8859-1'?>\n"

+ "<doc att='"

+ /* 64 characters per line */

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ /* Last character splits across a buffer boundary */

+ "\xe4'>\n</doc>";

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ /* 64 characters per line */

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP")

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO")

+ XCS("\x00e4");

+#else

+ const XML_Char *expected =

+ /* 64 characters per line */

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP")

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO")

+ XCS("\xc3\xa4");

+#endif

+ run_attribute_check(text, expected);

+END_TEST

+/* Test that a long ASCII attribute (too long to convert in one go)

+ * is correctly converted

+ */

+START_TEST(test_long_ascii_attribute)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<doc att='"

+ /* 64 characters per line */

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "01234'>\n</doc>";

+ const XML_Char *expected =

+ /* 64 characters per line */

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP")

+ XCS("01234");

+ run_attribute_check(text, expected);

}

END_TEST

@@ -500,7 +1106,7 @@ START_TEST(test_line_number_after_parse)

"\n</tag>";

XML_Size lineno;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_FALSE) == XML_STATUS_ERROR)

xml_failure(parser);

lineno = XML_GetCurrentLineNumber(parser);

if (lineno != 4) {

@@ -518,7 +1124,7 @@ START_TEST(test_column_number_after_parse)

const char *text = "<tag></tag>";

XML_Size colno;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_FALSE) == XML_STATUS_ERROR)

xml_failure(parser);

colno = XML_GetCurrentColumnNumber(parser);

if (colno != 11) {

@@ -530,33 +1136,27 @@ START_TEST(test_column_number_after_parse)

}

END_TEST

+#define STRUCT_START_TAG 0

+#define STRUCT_END_TAG 1

static void XMLCALL

start_element_event_handler2(void *userData, const XML_Char *name,

const XML_Char **UNUSED_P(attr))

{

- CharData *storage = (CharData *) userData;

- char buffer[100];

- sprintf(buffer,

- "<%s> at col:%" XML_FMT_INT_MOD "u line:%"\

- XML_FMT_INT_MOD "u\n", name,

- XML_GetCurrentColumnNumber(parser),

- XML_GetCurrentLineNumber(parser));

- CharData_AppendString(storage, buffer);

+ StructData *storage = (StructData *) userData;

+ StructData_AddItem(storage, name,

+ XML_GetCurrentColumnNumber(parser),

+ XML_GetCurrentLineNumber(parser),

+ STRUCT_START_TAG);

}

static void XMLCALL

end_element_event_handler2(void *userData, const XML_Char *name)

{

- CharData *storage = (CharData *) userData;

- char buffer[100];

- sprintf(buffer,

- "</%s> at col:%" XML_FMT_INT_MOD "u line:%"\

- XML_FMT_INT_MOD "u\n", name,

- XML_GetCurrentColumnNumber(parser),

- XML_GetCurrentLineNumber(parser));

- CharData_AppendString(storage, buffer);

+ StructData *storage = (StructData *) userData;

+ StructData_AddItem(storage, name,

+ XML_GetCurrentColumnNumber(parser),

+ XML_GetCurrentLineNumber(parser),

+ STRUCT_END_TAG);

}

/* Regression test #3 for SF bug #653180. */

@@ -571,27 +1171,30 @@ START_TEST(test_line_and_column_numbers_inside_handlers)

" <f/>\n"

" </d>\n"

"</a>";

- const char *expected =

- "<a> at col:0 line:1\n"

- " at col:2 line:2\n"

- "<c> at col:4 line:3\n"

- "</c> at col:8 line:3\n"

- " at col:2 line:4\n"

- "<d> at col:2 line:5\n"

- "<f> at col:4 line:6\n"

- "</f> at col:8 line:6\n"

- "</d> at col:2 line:7\n"

- "</a> at col:0 line:8\n";

- CharData storage;

+ const StructDataEntry expected[] = {

+ { XCS("a"), 0, 1, STRUCT_START_TAG },

+ { XCS("b"), 2, 2, STRUCT_START_TAG },

+ { XCS("c"), 4, 3, STRUCT_START_TAG },

+ { XCS("c"), 8, 3, STRUCT_END_TAG },

+ { XCS("b"), 2, 4, STRUCT_END_TAG },

+ { XCS("d"), 2, 5, STRUCT_START_TAG },

+ { XCS("f"), 4, 6, STRUCT_START_TAG },

+ { XCS("f"), 8, 6, STRUCT_END_TAG },

+ { XCS("d"), 2, 7, STRUCT_END_TAG },

+ { XCS("a"), 0, 8, STRUCT_END_TAG }

+ };

+ const int expected_count = sizeof(expected) / sizeof(StructDataEntry);

+ StructData storage;

- CharData_Init(&storage);

+ StructData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetStartElementHandler(parser, start_element_event_handler2);

XML_SetEndElementHandler(parser, end_element_event_handler2);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

- CharData_CheckString(&storage, expected);

+ StructData_CheckItems(&storage, expected, expected_count);

+ StructData_Dispose(&storage);

}

END_TEST

@@ -603,7 +1206,7 @@ START_TEST(test_line_number_after_error)

" \n"

" </a>"; /* missing */

XML_Size lineno;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_FALSE) != XML_STATUS_ERROR)

fail("Expected a parse error");

lineno = XML_GetCurrentLineNumber(parser);

@@ -623,7 +1226,7 @@ START_TEST(test_column_number_after_error)

" \n"

" </a>"; /* missing */

XML_Size colno;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_FALSE) != XML_STATUS_ERROR)

fail("Expected a parse error");

colno = XML_GetCurrentColumnNumber(parser);

@@ -666,7 +1269,51 @@ START_TEST(test_really_long_lines)

"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+"

"</e>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test cdata processing across a buffer boundary */

+START_TEST(test_really_long_encoded_lines)

+ /* As above, except that we want to provoke an output buffer

+ * overflow with a non-trivial encoding. For this we need to pass

+ * the whole cdata in one go, not byte-by-byte.

+ */

+ void *buffer;

+ const char *text =

+ "<?xml version='1.0' encoding='iso-8859-1'?>"

+ "<e>"

+ /* 64 chars */

+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+"

+ /* until we have at least 1024 characters on the line: */

+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-+"

+ "</e>";

+ int parse_len = (int)strlen(text);

+ /* Need a cdata handler to provoke the code path we want to test */

+ XML_SetCharacterDataHandler(parser, dummy_cdata_handler);

+ buffer = XML_GetBuffer(parser, parse_len);

+ if (buffer == NULL)

+ fail("Could not allocate parse buffer");

+ memcpy(buffer, text, parse_len);

+ if (XML_ParseBuffer(parser, parse_len, XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -677,25 +1324,33 @@ END_TEST

static void XMLCALL

+start_element_event_handler(void *userData,

+ const XML_Char *name,

+ const XML_Char **UNUSED_P(atts))

+ CharData_AppendXMLChars((CharData *)userData, name, -1);

+static void XMLCALL

end_element_event_handler(void *userData, const XML_Char *name)

{

CharData *storage = (CharData *) userData;

- CharData_AppendString(storage, "/");

+ CharData_AppendXMLChars(storage, XCS("/"), 1);

CharData_AppendXMLChars(storage, name, -1);

}

START_TEST(test_end_element_events)

{

const char *text = "<a><c/><d><f/></d></a>";

- const char *expected = "/c/b/f/d/a";

+ const XML_Char *expected = XCS("/c/b/f/d/a");

CharData storage;

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetEndElementHandler(parser, end_element_event_handler);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

- CharData_CheckString(&storage, expected);

+ CharData_CheckXMLChars(&storage, expected);

}

END_TEST

@@ -719,9 +1374,9 @@ is_whitespace_normalized(const XML_Char *s, int is_cdata)

int blanks = 0;

int at_start = 1;

while (*s) {

- if (*s == ' ')

+ if (*s == XCS(' '))

++blanks;

- else if (*s == '\t' || *s == '\n' || *s == '\r')

+ else if (*s == XCS('\t') || *s == XCS('\n') || *s == XCS('\r'))

return 0;

else {

if (at_start) {

@@ -745,25 +1400,25 @@ is_whitespace_normalized(const XML_Char *s, int is_cdata)

static void

testhelper_is_whitespace_normalized(void)

{

- assert(is_whitespace_normalized("abc", 0));

- assert(is_whitespace_normalized("abc", 1));

- assert(is_whitespace_normalized("abc def ghi", 0));

- assert(is_whitespace_normalized("abc def ghi", 1));

- assert(!is_whitespace_normalized(" abc def ghi", 0));

- assert(is_whitespace_normalized(" abc def ghi", 1));

- assert(!is_whitespace_normalized("abc def ghi", 0));

- assert(is_whitespace_normalized("abc def ghi", 1));

- assert(!is_whitespace_normalized("abc def ghi ", 0));

- assert(is_whitespace_normalized("abc def ghi ", 1));

- assert(!is_whitespace_normalized(" ", 0));

- assert(is_whitespace_normalized(" ", 1));

- assert(!is_whitespace_normalized("\t", 0));

- assert(!is_whitespace_normalized("\t", 1));

- assert(!is_whitespace_normalized("\n", 0));

- assert(!is_whitespace_normalized("\n", 1));

- assert(!is_whitespace_normalized("\r", 0));

- assert(!is_whitespace_normalized("\r", 1));

- assert(!is_whitespace_normalized("abc\t def", 1));

+ assert(is_whitespace_normalized(XCS("abc"), 0));

+ assert(is_whitespace_normalized(XCS("abc"), 1));

+ assert(is_whitespace_normalized(XCS("abc def ghi"), 0));

+ assert(is_whitespace_normalized(XCS("abc def ghi"), 1));

+ assert(!is_whitespace_normalized(XCS(" abc def ghi"), 0));

+ assert(is_whitespace_normalized(XCS(" abc def ghi"), 1));

+ assert(!is_whitespace_normalized(XCS("abc def ghi"), 0));

+ assert(is_whitespace_normalized(XCS("abc def ghi"), 1));

+ assert(!is_whitespace_normalized(XCS("abc def ghi "), 0));

+ assert(is_whitespace_normalized(XCS("abc def ghi "), 1));

+ assert(!is_whitespace_normalized(XCS(" "), 0));

+ assert(is_whitespace_normalized(XCS(" "), 1));

+ assert(!is_whitespace_normalized(XCS("\t"), 0));

+ assert(!is_whitespace_normalized(XCS("\t"), 1));

+ assert(!is_whitespace_normalized(XCS("\n"), 0));

+ assert(!is_whitespace_normalized(XCS("\n"), 1));

+ assert(!is_whitespace_normalized(XCS("\r"), 0));

+ assert(!is_whitespace_normalized(XCS("\r"), 1));

+ assert(!is_whitespace_normalized(XCS("abc\t def"), 1));

}

static void XMLCALL

@@ -775,12 +1430,13 @@ check_attr_contains_normalized_whitespace(void *UNUSED_P(userData),

for (i = 0; atts[i] != NULL; i += 2) {

const XML_Char *attrname = atts[i];

const XML_Char *value = atts[i + 1];

- if (strcmp("attr", attrname) == 0

- || strcmp("ents", attrname) == 0

- || strcmp("refs", attrname) == 0) {

+ if (xcstrcmp(XCS("attr"), attrname) == 0

+ || xcstrcmp(XCS("ents"), attrname) == 0

+ || xcstrcmp(XCS("refs"), attrname) == 0) {

if (!is_whitespace_normalized(value, 0)) {

char buffer[256];

- sprintf(buffer, "attribute value not normalized: %s='%s'",

+ sprintf(buffer, "attribute value not normalized: %"

+ XML_FMT_STR "='%" XML_FMT_STR "'",

attrname, value);

fail(buffer);

}

@@ -806,7 +1462,7 @@ START_TEST(test_attr_whitespace_normalization)

XML_SetStartElementHandler(parser,

check_attr_contains_normalized_whitespace);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -826,11 +1482,36 @@ START_TEST(test_xmldecl_misplaced)

}

END_TEST

+START_TEST(test_xmldecl_invalid)

+ expect_failure("<?xml version='1.0' \xc3\xa7?>\n<doc/>",

+ XML_ERROR_XML_DECL,

+ "Failed to report invalid XML declaration");

+END_TEST

+START_TEST(test_xmldecl_missing_attr)

+ expect_failure("<?xml ='1.0'?>\n<doc/>\n",

+ XML_ERROR_XML_DECL,

+ "Failed to report missing XML declaration attribute");

+END_TEST

+START_TEST(test_xmldecl_missing_value)

+ expect_failure("<?xml version='1.0' encoding='us-ascii' standalone?>\n"

+ "<doc/>",

+ XML_ERROR_XML_DECL,

+ "Failed to report missing attribute value");

+END_TEST

/* Regression test for SF bug #584832. */

static int XMLCALL

UnknownEncodingHandler(void *UNUSED_P(data),const XML_Char *encoding,XML_Encoding *info)

{

- if (strcmp(encoding,"unsupported-encoding") == 0) {

+ if (xcstrcmp(encoding, XCS("unsupported-encoding")) == 0) {

int i;

for (i = 0; i < 256; ++i)

info->map[i] = i;

@@ -850,51 +1531,218 @@ START_TEST(test_unknown_encoding_internal_entity)

"<test a='&foo;'/>";

XML_SetUnknownEncodingHandler(parser, UnknownEncodingHandler, NULL);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

-/* Regression test for SF bug #620106. */

+/* Test unrecognised encoding handler */

+static void dummy_release(void *UNUSED_P(data))

static int XMLCALL

-external_entity_loader_set_encoding(XML_Parser parser,

- const XML_Char *context,

- const XML_Char *UNUSED_P(base),

- const XML_Char *UNUSED_P(systemId),

- const XML_Char *UNUSED_P(publicId))

- /* This text says it's an unsupported encoding, but it's really

- UTF-8, which we tell Expat using XML_SetEncoding().

- */

+UnrecognisedEncodingHandler(void *UNUSED_P(data),

+ const XML_Char *UNUSED_P(encoding),

+ XML_Encoding *info)

+ info->data = NULL;

+ info->convert = NULL;

+ info->release = dummy_release;

+ return XML_STATUS_ERROR;

+START_TEST(test_unrecognised_encoding_internal_entity)

const char *text =

- "<?xml encoding='iso-8859-3'?>"

- "\xC3\xA9";

+ "<?xml version='1.0' encoding='unsupported-encoding'?>\n"

+ "<!DOCTYPE test [<!ENTITY foo 'bar'>]>\n"

+ "<test a='&foo;'/>";

+ XML_SetUnknownEncodingHandler(parser,

+ UnrecognisedEncodingHandler,

+ NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ fail("Unrecognised encoding not rejected");

+END_TEST

+/* Regression test for SF bug #620106. */

+static int XMLCALL

+external_entity_loader(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ ExtTest *test_data = (ExtTest *)XML_GetUserData(parser);

XML_Parser extparser;

extparser = XML_ExternalEntityParserCreate(parser, context, NULL);

if (extparser == NULL)

fail("Could not create external entity parser.");

- if (!XML_SetEncoding(extparser, "utf-8"))

- fail("XML_SetEncoding() ignored for external entity");

- if ( _XML_Parse_SINGLE_BYTES(extparser, text, strlen(text), XML_TRUE)

+ if (test_data->encoding != NULL) {

+ if (!XML_SetEncoding(extparser, test_data->encoding))

+ fail("XML_SetEncoding() ignored for external entity");

+ }

+ if ( _XML_Parse_SINGLE_BYTES(extparser,

+ test_data->parse_text,

+ (int)strlen(test_data->parse_text),

+ XML_TRUE)

== XML_STATUS_ERROR) {

- xml_failure(parser);

- return 0;

+ xml_failure(extparser);

+ return XML_STATUS_ERROR;

}

- return 1;

+ XML_ParserFree(extparser);

+ return XML_STATUS_OK;

}

START_TEST(test_ext_entity_set_encoding)

{

const char *text =

"<!DOCTYPE doc [\n"

- " <!ENTITY en SYSTEM 'http://xml.libexpat.org/dummy.ent'>\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

"]>\n"

"<doc>&en;</doc>";

+ ExtTest test_data = {

+ /* This text says it's an unsupported encoding, but it's really

+ UTF-8, which we tell Expat using XML_SetEncoding().

+ */

+ "<?xml encoding='iso-8859-3'?>\xC3\xA9",

+ XCS("utf-8"),

+ NULL

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e9");

+#else

+ const XML_Char *expected = XCS("\xc3\xa9");

+#endif

- XML_SetExternalEntityRefHandler(parser,

- external_entity_loader_set_encoding);

- run_character_check(text, "\xC3\xA9");

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ run_ext_character_check(text, &test_data, expected);

+END_TEST

+/* Test external entities with no handler */

+START_TEST(test_ext_entity_no_handler)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ XML_SetDefaultHandler(parser, dummy_default_handler);

+ run_character_check(text, XCS(""));

+END_TEST

+/* Test UTF-8 BOM is accepted */

+START_TEST(test_ext_entity_set_bom)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest test_data = {

+ "\xEF\xBB\xBF" /* BOM */

+ "<?xml encoding='iso-8859-3'?>"

+ "\xC3\xA9",

+ XCS("utf-8"),

+ NULL

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e9");

+#else

+ const XML_Char *expected = XCS("\xc3\xa9");

+#endif

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ run_ext_character_check(text, &test_data, expected);

+END_TEST

+/* Test that bad encodings are faulted */

+typedef struct ext_faults

+ const char *parse_text;

+ const char *fail_text;

+ const XML_Char *encoding;

+ enum XML_Error error;

+} ExtFaults;

+static int XMLCALL

+external_entity_faulter(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ XML_Parser ext_parser;

+ ExtFaults *fault = (ExtFaults *)XML_GetUserData(parser);

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (fault->encoding != NULL) {

+ if (!XML_SetEncoding(ext_parser, fault->encoding))

+ fail("XML_SetEncoding failed");

+ }

+ if (_XML_Parse_SINGLE_BYTES(ext_parser,

+ fault->parse_text,

+ (int)strlen(fault->parse_text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail(fault->fail_text);

+ if (XML_GetErrorCode(ext_parser) != fault->error)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_ERROR;

+START_TEST(test_ext_entity_bad_encoding)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtFaults fault = {

+ "<?xml encoding='iso-8859-3'?>u",

+ "Unsupported encoding not faulted",

+ XCS("unknown"),

+ XML_ERROR_UNKNOWN_ENCODING

+ };

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, &fault);

+ expect_failure(text,

+ XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Bad encoding should not have been accepted");

+END_TEST

+/* Try handing an invalid encoding to an external entity parser */

+START_TEST(test_ext_entity_bad_encoding_2)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ ExtFaults fault = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ "Unknown encoding not faulted",

+ XCS("unknown-encoding"),

+ XML_ERROR_UNKNOWN_ENCODING

+ };

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, &fault);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Bad encoding not faulted in external entity handler");

}

END_TEST

@@ -906,7 +1754,7 @@ START_TEST(test_wfc_undeclared_entity_unread_external_subset) {

"<!DOCTYPE doc SYSTEM 'foo'>\n"

"<doc>&entity;</doc>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -936,27 +1784,6 @@ START_TEST(test_wfc_undeclared_entity_standalone) {

}

END_TEST

-static int XMLCALL

-external_entity_loader(XML_Parser parser,

- const XML_Char *context,

- const XML_Char *UNUSED_P(base),

- const XML_Char *UNUSED_P(systemId),

- const XML_Char *UNUSED_P(publicId))

- char *text = (char *)XML_GetUserData(parser);

- XML_Parser extparser;

- extparser = XML_ExternalEntityParserCreate(parser, context, NULL);

- if (extparser == NULL)

- fail("Could not create external entity parser.");

- if ( _XML_Parse_SINGLE_BYTES(extparser, text, strlen(text), XML_TRUE)

- == XML_STATUS_ERROR) {

- xml_failure(parser);

- return XML_STATUS_ERROR;

- }

- return XML_STATUS_OK;

/* Test that an error is reported for unknown entities if we have read

an external subset, and standalone is true.

@@ -965,11 +1792,14 @@ START_TEST(test_wfc_undeclared_entity_with_external_subset_standalone) {

"<?xml version='1.0' encoding='us-ascii' standalone='yes'?>\n"

"<!DOCTYPE doc SYSTEM 'foo'>\n"

"<doc>&entity;</doc>";

- char foo_text[] =

- "<!ELEMENT doc (#PCDATA)*>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

- XML_SetUserData(parser, foo_text);

+ XML_SetUserData(parser, &test_data);

XML_SetExternalEntityRefHandler(parser, external_entity_loader);

expect_failure(text,

XML_ERROR_UNDEFINED_ENTITY,

@@ -977,6 +1807,26 @@ START_TEST(test_wfc_undeclared_entity_with_external_subset_standalone) {

}

END_TEST

+/* Test that external entity handling is not done if the parsing flag

+ * is set to UNLESS_STANDALONE

+ */

+START_TEST(test_entity_with_external_subset_unless_standalone) {

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii' standalone='yes'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ ExtTest test_data = { "<!ENTITY entity 'bar'>", NULL, NULL };

+ XML_SetParamEntityParsing(parser,

+ XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ expect_failure(text,

+ XML_ERROR_UNDEFINED_ENTITY,

+ "Parser did not report undefined entity");

+END_TEST

/* Test that no error is reported for unknown entities if we have read

an external subset, and standalone is false.

@@ -985,14 +1835,80 @@ START_TEST(test_wfc_undeclared_entity_with_external_subset) {

"<?xml version='1.0' encoding='us-ascii'?>\n"

"<!DOCTYPE doc SYSTEM 'foo'>\n"

"<doc>&entity;</doc>";

- char foo_text[] =

- "<!ELEMENT doc (#PCDATA)*>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

- XML_SetUserData(parser, foo_text);

XML_SetExternalEntityRefHandler(parser, external_entity_loader);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

- xml_failure(parser);

+ run_ext_character_check(text, &test_data, XCS(""));

+END_TEST

+/* Test that an error is reported if our NotStandalone handler fails */

+static int XMLCALL

+reject_not_standalone_handler(void *UNUSED_P(userData))

+ return XML_STATUS_ERROR;

+START_TEST(test_not_standalone_handler_reject)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetNotStandaloneHandler(parser, reject_not_standalone_handler);

+ expect_failure(text, XML_ERROR_NOT_STANDALONE,

+ "NotStandalone handler failed to reject");

+ /* Try again but without external entity handling */

+ XML_ParserReset(parser, NULL);

+ XML_SetNotStandaloneHandler(parser, reject_not_standalone_handler);

+ expect_failure(text, XML_ERROR_NOT_STANDALONE,

+ "NotStandalone handler failed to reject");

+END_TEST

+/* Test that no error is reported if our NotStandalone handler succeeds */

+static int XMLCALL

+accept_not_standalone_handler(void *UNUSED_P(userData))

+ return XML_STATUS_OK;

+START_TEST(test_not_standalone_handler_accept)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetNotStandaloneHandler(parser, accept_not_standalone_handler);

+ run_ext_character_check(text, &test_data, XCS(""));

+ /* Repeat wtihout the external entity handler */

+ XML_ParserReset(parser, NULL);

+ XML_SetNotStandaloneHandler(parser, accept_not_standalone_handler);

+ run_character_check(text, XCS(""));

}

END_TEST

@@ -1010,13 +1926,57 @@ START_TEST(test_wfc_no_recursive_entity_refs)

}

END_TEST

+/* Test incomplete external entities are faulted */

+START_TEST(test_ext_entity_invalid_parse)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ const ExtFaults faults[] = {

+ {

+ "<",

+ "Incomplete element declaration not faulted",

+ NULL,

+ XML_ERROR_UNCLOSED_TOKEN

+ },

+ {

+ "<\xe2\x82", /* First two bytes of a three-byte char */

+ "Incomplete character not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ {

+ "<tag>\xe2\x82",

+ "Incomplete character in CDATA not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ { NULL, NULL, NULL, XML_ERROR_NONE }

+ };

+ const ExtFaults *fault = faults;

+ for (; fault->parse_text != NULL; fault++) {

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, (void *)fault);

+ expect_failure(text,

+ XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Parser did not report external entity error");

+ XML_ParserReset(parser, NULL);

+ }

+END_TEST

/* Regression test for SF bug #483514. */

START_TEST(test_dtd_default_handling)

{

const char *text =

"<!DOCTYPE doc [\n"

- "<!ENTITY e SYSTEM 'http://xml.libexpat.org/e'>\n"

- "<!NOTATION n SYSTEM 'http://xml.libexpat.org/n'>\n"

+ "<!ENTITY e SYSTEM 'http://example.org/e'>\n"

+ "<!NOTATION n SYSTEM 'http://example.org/n'>\n"

"<!ELEMENT doc EMPTY>\n"

"<!ATTLIST doc a CDATA #IMPLIED>\n"

"<?pi in dtd?>\n"

@@ -1024,16 +1984,122 @@ START_TEST(test_dtd_default_handling)

"]><doc/>";

XML_SetDefaultHandler(parser, accumulate_characters);

- XML_SetDoctypeDeclHandler(parser,

- dummy_start_doctype_handler,

- dummy_end_doctype_handler);

+ XML_SetStartDoctypeDeclHandler(parser, dummy_start_doctype_handler);

+ XML_SetEndDoctypeDeclHandler(parser, dummy_end_doctype_handler);

XML_SetEntityDeclHandler(parser, dummy_entity_decl_handler);

XML_SetNotationDeclHandler(parser, dummy_notation_decl_handler);

XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

XML_SetAttlistDeclHandler(parser, dummy_attlist_decl_handler);

XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);

XML_SetCommentHandler(parser, dummy_comment_handler);

- run_character_check(text, "\n\n\n\n\n\n\n<doc/>");

+ XML_SetStartCdataSectionHandler(parser, dummy_start_cdata_handler);

+ XML_SetEndCdataSectionHandler(parser, dummy_end_cdata_handler);

+ run_character_check(text, XCS("\n\n\n\n\n\n\n<doc/>"));

+END_TEST

+/* Test handling of attribute declarations */

+typedef struct AttTest {

+ const char *definition;

+ const XML_Char *element_name;

+ const XML_Char *attr_name;

+ const XML_Char *attr_type;

+ const XML_Char *default_value;

+ int is_required;

+} AttTest;

+static void XMLCALL

+verify_attlist_decl_handler(void *userData,

+ const XML_Char *element_name,

+ const XML_Char *attr_name,

+ const XML_Char *attr_type,

+ const XML_Char *default_value,

+ int is_required)

+ AttTest *at = (AttTest *)userData;

+ if (xcstrcmp(element_name, at->element_name))

+ fail("Unexpected element name in attribute declaration");

+ if (xcstrcmp(attr_name, at->attr_name))

+ fail("Unexpected attribute name in attribute declaration");

+ if (xcstrcmp(attr_type, at->attr_type))

+ fail("Unexpected attribute type in attribute declaration");

+ if ((default_value == NULL && at->default_value != NULL) ||

+ (default_value != NULL && at->default_value == NULL) ||

+ (default_value != NULL && xcstrcmp(default_value, at->default_value)))

+ fail("Unexpected default value in attribute declaration");

+ if (is_required != at->is_required)

+ fail("Requirement mismatch in attribute declaration");

+START_TEST(test_dtd_attr_handling)

+ const char *prolog =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc EMPTY>\n";

+ AttTest attr_data[] = {

+ {

+ "<!ATTLIST doc a ( one | two | three ) #REQUIRED>\n"

+ "]>"

+ "<doc a='two'/>",

+ XCS("doc"),

+ XCS("a"),

+ XCS("(one|two|three)"), /* Extraneous spaces will be removed */

+ NULL,

+ XML_TRUE

+ },

+ {

+ "<!NOTATION foo SYSTEM 'http://example.org/foo'>\n"

+ "<!ATTLIST doc a NOTATION (foo) #IMPLIED>\n"

+ "]>"

+ "<doc/>",

+ XCS("doc"),

+ XCS("a"),

+ XCS("NOTATION(foo)"),

+ NULL,

+ XML_FALSE

+ },

+ {

+ "<!ATTLIST doc a NOTATION (foo) 'bar'>\n"

+ "]>"

+ "<doc/>",

+ XCS("doc"),

+ XCS("a"),

+ XCS("NOTATION(foo)"),

+ XCS("bar"),

+ XML_FALSE

+ },

+ {

+ "<!ATTLIST doc a CDATA '\xdb\xb2'>\n"

+ "]>"

+ "<doc/>",

+ XCS("doc"),

+ XCS("a"),

+ XCS("CDATA"),

+#ifdef XML_UNICODE

+ XCS("\x06f2"),

+#else

+ XCS("\xdb\xb2"),

+#endif

+ XML_FALSE

+ },

+ { NULL, NULL, NULL, NULL, NULL, XML_FALSE }

+ };

+ AttTest *test;

+ for (test = attr_data; test->definition != NULL; test++) {

+ XML_SetAttlistDeclHandler(parser, verify_attlist_decl_handler);

+ XML_SetUserData(parser, test);

+ if (_XML_Parse_SINGLE_BYTES(parser, prolog, (int)strlen(prolog),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (_XML_Parse_SINGLE_BYTES(parser,

+ test->definition,

+ (int)strlen(test->definition),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_ParserReset(parser, NULL);

+ }

}

END_TEST

@@ -1046,11 +2112,11 @@ END_TEST

START_TEST(test_empty_ns_without_namespaces)

{

const char *text =

- "<doc xmlns:prefix='http://www.example.com/'>\n"

+ "<doc xmlns:prefix='http://example.org/'>\n"

" <e xmlns:prefix=''/>\n"

"</doc>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -1064,11 +2130,11 @@ START_TEST(test_ns_in_attribute_default_without_namespaces)

const char *text =

"<!DOCTYPE e:element [\n"

" <!ATTLIST e:element\n"

- " xmlns:e CDATA 'http://example.com/'>\n"

+ " xmlns:e CDATA 'http://example.org/'>\n"

" ]>\n"

"<e:element/>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -1121,7 +2187,7 @@ START_TEST(test_stop_parser_between_char_data_calls)

XML_SetCharacterDataHandler(parser, clearing_aborting_character_handler);

resumable = XML_FALSE;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

xml_failure(parser);

if (XML_GetErrorCode(parser) != XML_ERROR_ABORTED)

xml_failure(parser);

@@ -1142,24 +2208,103 @@ START_TEST(test_suspend_parser_between_char_data_calls)

XML_SetCharacterDataHandler(parser, clearing_aborting_character_handler);

resumable = XML_TRUE;

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) != XML_STATUS_SUSPENDED)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_SUSPENDED)

xml_failure(parser);

if (XML_GetErrorCode(parser) != XML_ERROR_NONE)

xml_failure(parser);

+ /* Try parsing directly */

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ fail("Attempt to continue parse while suspended not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_SUSPENDED)

+ fail("Suspended parse not faulted with correct error");

+END_TEST

+static XML_Bool abortable = XML_FALSE;

+static void

+parser_stop_character_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

+ XML_StopParser(parser, resumable);

+ XML_SetCharacterDataHandler(parser, NULL);

+ if (!resumable) {

+ /* Check that aborting an aborted parser is faulted */

+ if (XML_StopParser(parser, XML_FALSE) != XML_STATUS_ERROR)

+ fail("Aborting aborted parser not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_FINISHED)

+ xml_failure(parser);

+ } else if (abortable) {

+ /* Check that aborting a suspended parser works */

+ if (XML_StopParser(parser, XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ } else {

+ /* Check that suspending a suspended parser works */

+ if (XML_StopParser(parser, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Suspending suspended parser not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_SUSPENDED)

+ xml_failure(parser);

+ }

+/* Test repeated calls to XML_StopParser are handled correctly */

+START_TEST(test_repeated_stop_parser_between_char_data_calls)

+ const char *text = long_character_data_text;

+ XML_SetCharacterDataHandler(parser, parser_stop_character_handler);

+ resumable = XML_FALSE;

+ abortable = XML_FALSE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Failed to double-stop parser");

+ XML_ParserReset(parser, NULL);

+ XML_SetCharacterDataHandler(parser, parser_stop_character_handler);

+ resumable = XML_TRUE;

+ abortable = XML_FALSE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ fail("Failed to double-suspend parser");

+ XML_ParserReset(parser, NULL);

+ XML_SetCharacterDataHandler(parser, parser_stop_character_handler);

+ resumable = XML_TRUE;

+ abortable = XML_TRUE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Failed to suspend-abort parser");

}

END_TEST

START_TEST(test_good_cdata_ascii)

{

const char *text = "<a><![CDATA[<greeting>Hello, world!</greeting>]]></a>";

- const char *expected = "<greeting>Hello, world!</greeting>";

+ const XML_Char *expected = XCS("<greeting>Hello, world!</greeting>");

CharData storage;

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetCharacterDataHandler(parser, accumulate_characters);

+ /* Add start and end handlers for coverage */

+ XML_SetStartCdataSectionHandler(parser, dummy_start_cdata_handler);

+ XML_SetEndCdataSectionHandler(parser, dummy_end_cdata_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+ /* Try again, this time with a default handler */

+ XML_ParserReset(parser, NULL);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ XML_SetDefaultHandler(parser, dummy_default_handler);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

CharData_CheckXMLChars(&storage, expected);

}

@@ -1177,19 +2322,185 @@ START_TEST(test_good_cdata_utf16)

" \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0""1\0""6\0'"

"\0?\0>\0\n"

"\0<\0a\0>\0<\0!\0[\0C\0D\0A\0T\0A\0[\0h\0e\0l\0l\0o\0]\0]\0>\0<\0/\0a\0>";

- const char *expected = "hello";

+ const XML_Char *expected = XCS("hello");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text) - 1, XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_good_cdata_utf16_le)

+ /* Test data is:

+ * <?xml version='1.0' encoding='utf-16'?>

+ * <a><![CDATA[hello]]></a>

+ */

+ const char text[] =

+ "<\0?\0x\0m\0l\0"

+ " \0v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0"

+ " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0""1\0""6\0'"

+ "\0?\0>\0\n"

+ "\0<\0a\0>\0<\0!\0[\0C\0D\0A\0T\0A\0[\0h\0e\0l\0l\0o\0]\0]\0>\0<\0/\0a\0>\0";

+ const XML_Char *expected = XCS("hello");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text) - 1, XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test UTF16 conversion of a long cdata string */

+/* 16 characters: handy macro to reduce visual clutter */

+#define A_TO_P_IN_UTF16 "\0A\0B\0C\0D\0E\0F\0G\0H\0I\0J\0K\0L\0M\0N\0O\0P"

+START_TEST(test_long_cdata_utf16)

+ /* Test data is:

+ * <?xlm version='1.0' encoding='utf-16'?>

+ * <a><![CDATA[

+ * ABCDEFGHIJKLMNOP

+ * ]]></a>

+ */

+ const char text[] =

+ "\0<\0?\0x\0m\0l\0 "

+ "\0v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0 "

+ "\0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0\x31\0\x36\0'\0?\0>"

+ "\0<\0a\0>\0<\0!\0[\0C\0D\0A\0T\0A\0["

+ /* 64 characters per line */

+ A_TO_P_IN_UTF16 A_TO_P_IN_UTF16 A_TO_P_IN_UTF16 A_TO_P_IN_UTF16

+ A_TO_P_IN_UTF16

+ "\0]\0]\0>\0<\0/\0a\0>";

+ const XML_Char *expected =

+ XCS("ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP")

+ XCS("ABCDEFGHIJKLMNOP";)

+ CharData storage;

+ void *buffer;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ buffer = XML_GetBuffer(parser, sizeof(text) - 1);

+ if (buffer == NULL)

+ fail("Could not allocate parse buffer");

+ memcpy(buffer, text, sizeof(text) - 1);

+ if (XML_ParseBuffer(parser,

+ sizeof(text) - 1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test handling of multiple unit UTF-16 characters */

+START_TEST(test_multichar_cdata_utf16)

+ /* Test data is:

+ * <?xml version='1.0' encoding='utf-16'?>

+ * <a><![CDATA[{MINIM}{CROTCHET}]]></a>

+ *

+ * where {MINIM} is U+1d15e (a minim or half-note)

+ * UTF-16: 0xd834 0xdd5e

+ * UTF-8: 0xf0 0x9d 0x85 0x9e

+ * and {CROTCHET} is U+1d15f (a crotchet or quarter-note)

+ * UTF-16: 0xd834 0xdd5f

+ * UTF-8: 0xf0 0x9d 0x85 0x9f

+ */

+ const char text[] =

+ "\0<\0?\0x\0m\0l\0"

+ " \0v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0"

+ " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0""1\0""6\0'"

+ "\0?\0>\0\n"

+ "\0<\0a\0>\0<\0!\0[\0C\0D\0A\0T\0A\0["

+ "\xd8\x34\xdd\x5e\xd8\x34\xdd\x5f"

+ "\0]\0]\0>\0<\0/\0a\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\xd834\xdd5e\xd834\xdd5f");

+#else

+ const XML_Char *expected = XCS("\xf0\x9d\x85\x9e\xf0\x9d\x85\x9f");

+#endif

CharData storage;

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetCharacterDataHandler(parser, accumulate_characters);

- if (_XML_Parse_SINGLE_BYTES(parser, text, sizeof(text) - 1, XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text) - 1, XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

CharData_CheckXMLChars(&storage, expected);

}

END_TEST

+/* Test that an element name with a UTF-16 surrogate pair is rejected */

+START_TEST(test_utf16_bad_surrogate_pair)

+ /* Test data is:

+ * <?xml version='1.0' encoding='utf-16'?>

+ * <a><![CDATA[{BADLINB}]]></a>

+ *

+ * where {BADLINB} is U+10000 (the first Linear B character)

+ * with the UTF-16 surrogate pair in the wrong order, i.e.

+ * 0xdc00 0xd800

+ */

+ const char text[] =

+ "\0<\0?\0x\0m\0l\0"

+ " \0v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0"

+ " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0""1\0""6\0'"

+ "\0?\0>\0\n"

+ "\0<\0a\0>\0<\0!\0[\0C\0D\0A\0T\0A\0["

+ "\xdc\x00\xd8\x00"

+ "\0]\0]\0>\0<\0/\0a\0>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text) - 1,

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Reversed UTF-16 surrogate pair not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_INVALID_TOKEN)

+ xml_failure(parser);

+END_TEST

START_TEST(test_bad_cdata)

{

struct CaseData {

@@ -1227,7 +2538,7 @@ START_TEST(test_bad_cdata)

size_t i = 0;

for (; i < sizeof(cases) / sizeof(struct CaseData); i++) {

const enum XML_Status actualStatus = _XML_Parse_SINGLE_BYTES(

- parser, cases[i].text, strlen(cases[i].text), XML_TRUE);

+ parser, cases[i].text, (int)strlen(cases[i].text), XML_TRUE);

const enum XML_Error actualError = XML_GetErrorCode(parser);

assert(actualStatus == XML_STATUS_ERROR);

@@ -1244,6 +2555,4561 @@ START_TEST(test_bad_cdata)

}

END_TEST

+/* Test failures in UTF-16 CDATA */

+START_TEST(test_bad_cdata_utf16)

+ struct CaseData {

+ size_t text_bytes;

+ const char *text;

+ enum XML_Error expected_error;

+ };

+ const char prolog[] =

+ "\0<\0?\0x\0m\0l\0"

+ " \0v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0"

+ " \0e\0n\0c\0o\0d\0i\0n\0g\0=\0'\0u\0t\0f\0-\0""1\0""6\0'"

+ "\0?\0>\0\n"

+ "\0<\0a\0>";

+ struct CaseData cases[] = {

+ {1, "\0", XML_ERROR_UNCLOSED_TOKEN},

+ {2, "\0<", XML_ERROR_UNCLOSED_TOKEN},

+ {3, "\0<\0", XML_ERROR_UNCLOSED_TOKEN},

+ {4, "\0<\0!", XML_ERROR_UNCLOSED_TOKEN},

+ {5, "\0<\0!\0", XML_ERROR_UNCLOSED_TOKEN},

+ {6, "\0<\0!\0[", XML_ERROR_UNCLOSED_TOKEN},

+ {7, "\0<\0!\0[\0", XML_ERROR_UNCLOSED_TOKEN},

+ {8, "\0<\0!\0[\0C", XML_ERROR_UNCLOSED_TOKEN},

+ {9, "\0<\0!\0[\0C\0", XML_ERROR_UNCLOSED_TOKEN},

+ {10, "\0<\0!\0[\0C\0D", XML_ERROR_UNCLOSED_TOKEN},

+ {11, "\0<\0!\0[\0C\0D\0", XML_ERROR_UNCLOSED_TOKEN},

+ {12, "\0<\0!\0[\0C\0D\0A", XML_ERROR_UNCLOSED_TOKEN},

+ {13, "\0<\0!\0[\0C\0D\0A\0", XML_ERROR_UNCLOSED_TOKEN},

+ {14, "\0<\0!\0[\0C\0D\0A\0T", XML_ERROR_UNCLOSED_TOKEN},

+ {15, "\0<\0!\0[\0C\0D\0A\0T\0", XML_ERROR_UNCLOSED_TOKEN},

+ {16, "\0<\0!\0[\0C\0D\0A\0T\0A", XML_ERROR_UNCLOSED_TOKEN},

+ {17, "\0<\0!\0[\0C\0D\0A\0T\0A\0", XML_ERROR_UNCLOSED_TOKEN},

+ {18, "\0<\0!\0[\0C\0D\0A\0T\0A\0[",

+ XML_ERROR_UNCLOSED_CDATA_SECTION},

+ {19, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0",

+ XML_ERROR_UNCLOSED_CDATA_SECTION},

+ {20, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0Z",

+ XML_ERROR_UNCLOSED_CDATA_SECTION},

+ /* Now add a four-byte UTF-16 character */

+ {21, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0Z\xd8",

+ XML_ERROR_UNCLOSED_CDATA_SECTION},

+ {22, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0Z\xd8\x34",

+ XML_ERROR_PARTIAL_CHAR},

+ {23, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0Z\xd8\x34\xdd",

+ XML_ERROR_PARTIAL_CHAR},

+ {24, "\0<\0!\0[\0C\0D\0A\0T\0A\0[\0Z\xd8\x34\xdd\x5e",

+ XML_ERROR_UNCLOSED_CDATA_SECTION}

+ };

+ size_t i;

+ for (i = 0; i < sizeof(cases)/sizeof(struct CaseData); i++) {

+ enum XML_Status actual_status;

+ enum XML_Error actual_error;

+ if (_XML_Parse_SINGLE_BYTES(parser, prolog, (int)sizeof(prolog)-1,

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ actual_status = _XML_Parse_SINGLE_BYTES(parser,

+ cases[i].text,

+ (int)cases[i].text_bytes,

+ XML_TRUE);

+ assert(actual_status == XML_STATUS_ERROR);

+ actual_error = XML_GetErrorCode(parser);

+ if (actual_error != cases[i].expected_error) {

+ char message[1024];

+ sprintf(message,

+ "Expected error %d (%" XML_FMT_STR

+ "), got %d (%" XML_FMT_STR ") for case %lu\n",

+ cases[i].expected_error,

+ XML_ErrorString(cases[i].expected_error),

+ actual_error,

+ XML_ErrorString(actual_error),

+ (long unsigned)(i+1));

+ fail(message);

+ }

+ XML_ParserReset(parser, NULL);

+ }

+END_TEST

+static const char *long_cdata_text =

+ "<s><![CDATA["

+ "012345678901234567890123456789012345678901234567890123456789"

+ "]]></s>";

+/* Test stopping the parser in cdata handler */

+START_TEST(test_stop_parser_between_cdata_calls)

+ const char *text = long_cdata_text;

+ XML_SetCharacterDataHandler(parser,

+ clearing_aborting_character_handler);

+ resumable = XML_FALSE;

+ expect_failure(text, XML_ERROR_ABORTED,

+ "Parse not aborted in CDATA handler");

+END_TEST

+/* Test suspending the parser in cdata handler */

+START_TEST(test_suspend_parser_between_cdata_calls)

+ const char *text = long_cdata_text;

+ enum XML_Status result;

+ XML_SetCharacterDataHandler(parser,

+ clearing_aborting_character_handler);

+ resumable = XML_TRUE;

+ result = _XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE);

+ if (result != XML_STATUS_SUSPENDED) {

+ if (result == XML_STATUS_ERROR)

+ xml_failure(parser);

+ fail("Parse not suspended in CDATA handler");

+ }

+ if (XML_GetErrorCode(parser) != XML_ERROR_NONE)

+ xml_failure(parser);

+END_TEST

+/* Test memory allocation functions */

+START_TEST(test_memory_allocation)

+ char *buffer = (char *)XML_MemMalloc(parser, 256);

+ char *p;

+ if (buffer == NULL) {

+ fail("Allocation failed");

+ } else {

+ /* Try writing to memory; some OSes try to cheat! */

+ buffer[0] = 'T';

+ buffer[1] = 'E';

+ buffer[2] = 'S';

+ buffer[3] = 'T';

+ buffer[4] = '\0';

+ if (strcmp(buffer, "TEST") != 0) {

+ fail("Memory not writable");

+ } else {

+ p = (char *)XML_MemRealloc(parser, buffer, 512);

+ if (p == NULL) {

+ fail("Reallocation failed");

+ } else {

+ /* Write again, just to be sure */

+ buffer = p;

+ buffer[0] = 'V';

+ if (strcmp(buffer, "VEST") != 0) {

+ fail("Reallocated memory not writable");

+ }

+ XML_MemFree(parser, buffer);

+ }

+END_TEST

+static void XMLCALL

+record_default_handler(void *userData,

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

+ CharData_AppendXMLChars((CharData *)userData, XCS("D"), 1);

+static void XMLCALL

+record_cdata_handler(void *userData,

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

+ CharData_AppendXMLChars((CharData *)userData, XCS("C"), 1);

+ XML_DefaultCurrent(parser);

+static void XMLCALL

+record_cdata_nodefault_handler(void *userData,

+ const XML_Char *UNUSED_P(s),

+ int UNUSED_P(len))

+ CharData_AppendXMLChars((CharData *)userData, XCS("c"), 1);

+static void XMLCALL

+record_skip_handler(void *userData,

+ const XML_Char *UNUSED_P(entityName),

+ int is_parameter_entity)

+ CharData_AppendXMLChars((CharData *)userData,

+ is_parameter_entity ? XCS("E") : XCS("e"), 1);

+/* Test XML_DefaultCurrent() passes handling on correctly */

+START_TEST(test_default_current)

+ const char *text = "<doc>hell]</doc>";

+ const char *entity_text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY entity '%'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ CharData storage;

+ XML_SetDefaultHandler(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS("DCDCDCDCDCDD"));

+ /* Again, without the defaulting */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_nodefault_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS("DcccccD"));

+ /* Now with an internal entity to complicate matters */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, entity_text, (int)strlen(entity_text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* The default handler suppresses the entity */

+ CharData_CheckXMLChars(&storage, XCS("DDDDDDDDDDDDDDDDDDD"));

+ /* Again, with a skip handler */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_handler);

+ XML_SetSkippedEntityHandler(parser, record_skip_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, entity_text, (int)strlen(entity_text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* The default handler suppresses the entity */

+ CharData_CheckXMLChars(&storage, XCS("DDDDDDDDDDDDDDDDDeD"));

+ /* This time, allow the entity through */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandlerExpand(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, entity_text, (int)strlen(entity_text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS("DDDDDDDDDDDDDDDDDCDD"));

+ /* Finally, without passing the cdata to the default handler */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandlerExpand(parser, record_default_handler);

+ XML_SetCharacterDataHandler(parser, record_cdata_nodefault_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, entity_text, (int)strlen(entity_text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS("DDDDDDDDDDDDDDDDDcD"));

+END_TEST

+/* Test DTD element parsing code paths */

+START_TEST(test_dtd_elements)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc (chapter)>\n"

+ "<!ELEMENT chapter (#PCDATA)>\n"

+ "]>\n"

+ "<doc><chapter>Wombats are go</chapter></doc>";

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test foreign DTD handling */

+START_TEST(test_set_foreign_dtd)

+ const char *text1 =

+ "<?xml version='1.0' encoding='us-ascii'?>\n";

+ const char *text2 =

+ "<doc>&entity;</doc>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

+ /* Check hash salt is passed through too */

+ XML_SetHashSalt(parser, 0x12345678);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ /* Add a default handler to exercise more code paths */

+ XML_SetDefaultHandler(parser, dummy_default_handler);

+ if (XML_UseForeignDTD(parser, XML_TRUE) != XML_ERROR_NONE)

+ fail("Could not set foreign DTD");

+ if (_XML_Parse_SINGLE_BYTES(parser, text1, (int)strlen(text1),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Ensure that trying to set the DTD after parsing has started

+ * is faulted, even if it's the same setting.

+ */

+ if (XML_UseForeignDTD(parser, XML_TRUE) !=

+ XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING)

+ fail("Failed to reject late foreign DTD setting");

+ /* Ditto for the hash salt */

+ if (XML_SetHashSalt(parser, 0x23456789))

+ fail("Failed to reject late hash salt change");

+ /* Now finish the parse */

+ if (_XML_Parse_SINGLE_BYTES(parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test foreign DTD handling with a failing NotStandalone handler */

+START_TEST(test_foreign_dtd_not_standalone)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<doc>&entity;</doc>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetNotStandaloneHandler(parser, reject_not_standalone_handler);

+ if (XML_UseForeignDTD(parser, XML_TRUE) != XML_ERROR_NONE)

+ fail("Could not set foreign DTD");

+ expect_failure(text, XML_ERROR_NOT_STANDALONE,

+ "NotStandalonehandler failed to reject");

+END_TEST

+/* Test invalid character in a foreign DTD is faulted */

+START_TEST(test_invalid_foreign_dtd)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<doc>&entity;</doc>";

+ ExtFaults test_data = {

+ "$",

+ "Dollar not faulted",

+ NULL,

+ XML_ERROR_INVALID_TOKEN

+ };

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_UseForeignDTD(parser, XML_TRUE);

+ expect_failure(text,

+ XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Bad DTD should not have been accepted");

+END_TEST

+/* Test foreign DTD use with a doctype */

+START_TEST(test_foreign_dtd_with_doctype)

+ const char *text1 =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc [<!ENTITY entity 'hello world'>]>\n";

+ const char *text2 =

+ "<doc>&entity;</doc>";

+ ExtTest test_data = {

+ "<!ELEMENT doc (#PCDATA)*>",

+ NULL,

+ NULL

+ };

+ /* Check hash salt is passed through too */

+ XML_SetHashSalt(parser, 0x12345678);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &test_data);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ /* Add a default handler to exercise more code paths */

+ XML_SetDefaultHandler(parser, dummy_default_handler);

+ if (XML_UseForeignDTD(parser, XML_TRUE) != XML_ERROR_NONE)

+ fail("Could not set foreign DTD");

+ if (_XML_Parse_SINGLE_BYTES(parser, text1, (int)strlen(text1),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Ensure that trying to set the DTD after parsing has started

+ * is faulted, even if it's the same setting.

+ */

+ if (XML_UseForeignDTD(parser, XML_TRUE) !=

+ XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING)

+ fail("Failed to reject late foreign DTD setting");

+ /* Ditto for the hash salt */

+ if (XML_SetHashSalt(parser, 0x23456789))

+ fail("Failed to reject late hash salt change");

+ /* Now finish the parse */

+ if (_XML_Parse_SINGLE_BYTES(parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test XML_UseForeignDTD with no external subset present */

+static int XMLCALL

+external_entity_null_loader(XML_Parser UNUSED_P(parser),

+ const XML_Char *UNUSED_P(context),

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ return XML_STATUS_OK;

+START_TEST(test_foreign_dtd_without_external_subset)

+ const char *text =

+ "<!DOCTYPE doc [<!ENTITY foo 'bar'>]>\n"

+ "<doc>&foo;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, NULL);

+ XML_SetExternalEntityRefHandler(parser, external_entity_null_loader);

+ XML_UseForeignDTD(parser, XML_TRUE);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_empty_foreign_dtd)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_null_loader);

+ XML_UseForeignDTD(parser, XML_TRUE);

+ expect_failure(text, XML_ERROR_UNDEFINED_ENTITY,

+ "Undefined entity not faulted");

+END_TEST

+/* Test XML Base is set and unset appropriately */

+START_TEST(test_set_base)

+ const XML_Char *old_base;

+ const XML_Char *new_base = XCS("/local/file/name.xml");

+ old_base = XML_GetBase(parser);

+ if (XML_SetBase(parser, new_base) != XML_STATUS_OK)

+ fail("Unable to set base");

+ if (xcstrcmp(XML_GetBase(parser), new_base) != 0)

+ fail("Base setting not correct");

+ if (XML_SetBase(parser, NULL) != XML_STATUS_OK)

+ fail("Unable to NULL base");

+ if (XML_GetBase(parser) != NULL)

+ fail("Base setting not nulled");

+ XML_SetBase(parser, old_base);

+END_TEST

+/* Test attribute counts, indexing, etc */

+typedef struct attrInfo {

+ const XML_Char *name;

+ const XML_Char *value;

+} AttrInfo;

+typedef struct elementInfo {

+ const XML_Char *name;

+ int attr_count;

+ const XML_Char *id_name;

+ AttrInfo *attributes;

+} ElementInfo;

+static void XMLCALL

+counting_start_element_handler(void *userData,

+ const XML_Char *name,

+ const XML_Char **atts)

+ ElementInfo *info = (ElementInfo *)userData;

+ AttrInfo *attr;

+ int count, id, i;

+ while (info->name != NULL) {

+ if (!xcstrcmp(name, info->name))

+ break;

+ info++;

+ }

+ if (info->name == NULL)

+ fail("Element not recognised");

+ /* The attribute count is twice what you might expect. It is a

+ * count of items in atts, an array which contains alternating

+ * attribute names and attribute values. For the naive user this

+ * is possibly a little unexpected, but it is what the

+ * documentation in expat.h tells us to expect.

+ */

+ count = XML_GetSpecifiedAttributeCount(parser);

+ if (info->attr_count * 2 != count) {

+ fail("Not got expected attribute count");

+ return;

+ }

+ id = XML_GetIdAttributeIndex(parser);

+ if (id == -1 && info->id_name != NULL) {

+ fail("ID not present");

+ return;

+ }

+ if (id != -1 && xcstrcmp(atts[id], info->id_name)) {

+ fail("ID does not have the correct name");

+ return;

+ }

+ for (i = 0; i < info->attr_count; i++) {

+ attr = info->attributes;

+ while (attr->name != NULL) {

+ if (!xcstrcmp(atts[0], attr->name))

+ break;

+ attr++;

+ }

+ if (attr->name == NULL) {

+ fail("Attribute not recognised");

+ return;

+ }

+ if (xcstrcmp(atts[1], attr->value)) {

+ fail("Attribute has wrong value");

+ return;

+ }

+ /* Remember, two entries in atts per attribute (see above) */

+ atts += 2;

+ }

+START_TEST(test_attributes)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc (tag)>\n"

+ "<!ATTLIST doc id ID #REQUIRED>\n"

+ "]>"

+ "<doc a='1' id='one' b='2'>"

+ "<tag c='3'/>"

+ "</doc>";

+ AttrInfo doc_info[] = {

+ { XCS("a"), XCS("1") },

+ { XCS("b"), XCS("2") },

+ { XCS("id"), XCS("one") },

+ { NULL, NULL }

+ };

+ AttrInfo tag_info[] = {

+ { XCS("c"), XCS("3") },

+ { NULL, NULL }

+ };

+ ElementInfo info[] = {

+ { XCS("doc"), 3, XCS("id"), NULL },

+ { XCS("tag"), 1, NULL, NULL },

+ { NULL, 0, NULL, NULL }

+ };

+ info[0].attributes = doc_info;

+ info[1].attributes = tag_info;

+ XML_SetStartElementHandler(parser, counting_start_element_handler);

+ XML_SetUserData(parser, info);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test reset works correctly in the middle of processing an internal

+ * entity. Exercises some obscure code in XML_ParserReset().

+ */

+START_TEST(test_reset_in_entity)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY wombat 'wom'>\n"

+ "<!ENTITY entity 'hi &wom; there'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ XML_ParsingStatus status;

+ resumable = XML_TRUE;

+ XML_SetCharacterDataHandler(parser, clearing_aborting_character_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_GetParsingStatus(parser, &status);

+ if (status.parsing != XML_SUSPENDED)

+ fail("Parsing status not SUSPENDED");

+ XML_ParserReset(parser, NULL);

+ XML_GetParsingStatus(parser, &status);

+ if (status.parsing != XML_INITIALIZED)

+ fail("Parsing status doesn't reset to INITIALIZED");

+END_TEST

+/* Test that resume correctly passes through parse errors */

+START_TEST(test_resume_invalid_parse)

+ const char *text = "<doc>Hello</doc"; /* Missing closing wedge */

+ resumable = XML_TRUE;

+ XML_SetCharacterDataHandler(parser,

+ clearing_aborting_character_handler);

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (XML_ResumeParser(parser) == XML_STATUS_OK)

+ fail("Resumed invalid parse not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_UNCLOSED_TOKEN)

+ fail("Invalid parse not correctly faulted");

+END_TEST

+/* Test that re-suspended parses are correctly passed through */

+START_TEST(test_resume_resuspended)

+ const char *text = "<doc>Hello<meep/>world</doc>";

+ resumable = XML_TRUE;

+ XML_SetCharacterDataHandler(parser,

+ clearing_aborting_character_handler);

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ resumable = XML_TRUE;

+ XML_SetCharacterDataHandler(parser,

+ clearing_aborting_character_handler);

+ if (XML_ResumeParser(parser) != XML_STATUS_SUSPENDED)

+ fail("Resumption not suspended");

+ /* This one should succeed and finish up */

+ if (XML_ResumeParser(parser) != XML_STATUS_OK)

+ xml_failure(parser);

+END_TEST

+/* Test that CDATA shows up correctly through a default handler */

+START_TEST(test_cdata_default)

+ const char *text = "<doc><![CDATA[Hello\nworld]]></doc>";

+ const XML_Char *expected = XCS("<doc><![CDATA[Hello\nworld]]></doc>");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test resetting a subordinate parser does exactly nothing */

+static int XMLCALL

+external_entity_resetter(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<!ELEMENT doc (#PCDATA)*>";

+ XML_Parser ext_parser;

+ XML_ParsingStatus status;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_GetParsingStatus(ext_parser, &status);

+ if (status.parsing != XML_INITIALIZED) {

+ fail("Parsing status is not INITIALIZED");

+ return XML_STATUS_ERROR;

+ }

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(parser);

+ return XML_STATUS_ERROR;

+ }

+ XML_GetParsingStatus(ext_parser, &status);

+ if (status.parsing != XML_FINISHED) {

+ fail("Parsing status is not FINISHED");

+ return XML_STATUS_ERROR;

+ }

+ /* Check we can't parse here */

+ if (XML_Parse(ext_parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Parsing when finished not faulted");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_FINISHED)

+ fail("Parsing when finished faulted with wrong code");

+ XML_ParserReset(ext_parser, NULL);

+ XML_GetParsingStatus(ext_parser, &status);

+ if (status.parsing != XML_FINISHED) {

+ fail("Parsing status not still FINISHED");

+ return XML_STATUS_ERROR;

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_subordinate_reset)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_resetter);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test suspending a subordinate parser */

+static void XMLCALL

+entity_suspending_decl_handler(void *userData,

+ const XML_Char *UNUSED_P(name),

+ XML_Content *model)

+ XML_Parser ext_parser = (XML_Parser)userData;

+ if (XML_StopParser(ext_parser, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Attempting to suspend a subordinate parser not faulted");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_SUSPEND_PE)

+ fail("Suspending subordinate parser get wrong code");

+ XML_SetElementDeclHandler(ext_parser, NULL);

+ XML_FreeContentModel(parser, model);

+static int XMLCALL

+external_entity_suspender(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<!ELEMENT doc (#PCDATA)*>";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetElementDeclHandler(ext_parser, entity_suspending_decl_handler);

+ XML_SetUserData(ext_parser, ext_parser);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(ext_parser);

+ return XML_STATUS_ERROR;

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_subordinate_suspend)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_suspender);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test suspending a subordinate parser from an XML declaration */

+/* Increases code coverage of the tests */

+static void XMLCALL

+entity_suspending_xdecl_handler(void *userData,

+ const XML_Char *UNUSED_P(version),

+ const XML_Char *UNUSED_P(encoding),

+ int UNUSED_P(standalone))

+ XML_Parser ext_parser = (XML_Parser)userData;

+ XML_StopParser(ext_parser, resumable);

+ XML_SetXmlDeclHandler(ext_parser, NULL);

+static int XMLCALL

+external_entity_suspend_xmldecl(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<?xml version='1.0' encoding='us-ascii'?>";

+ XML_Parser ext_parser;

+ XML_ParsingStatus status;

+ enum XML_Status rc;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetXmlDeclHandler(ext_parser, entity_suspending_xdecl_handler);

+ XML_SetUserData(ext_parser, ext_parser);

+ rc = _XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text), XML_TRUE);

+ XML_GetParsingStatus(ext_parser, &status);

+ if (resumable) {

+ if (rc == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ if (status.parsing != XML_SUSPENDED)

+ fail("Ext Parsing status not SUSPENDED");

+ } else {

+ if (rc != XML_STATUS_ERROR)

+ fail("Ext parsing not aborted");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_ABORTED)

+ xml_failure(ext_parser);

+ if (status.parsing != XML_FINISHED)

+ fail("Ext Parsing status not FINISHED");

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_subordinate_xdecl_suspend)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY entity SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_suspend_xmldecl);

+ resumable = XML_TRUE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_subordinate_xdecl_abort)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY entity SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_suspend_xmldecl);

+ resumable = XML_FALSE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test external entity fault handling with suspension */

+static int XMLCALL

+external_entity_suspending_faulter(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ XML_Parser ext_parser;

+ ExtFaults *fault = (ExtFaults *)XML_GetUserData(parser);

+ void *buffer;

+ int parse_len = (int)strlen(fault->parse_text);

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetXmlDeclHandler(ext_parser, entity_suspending_xdecl_handler);

+ XML_SetUserData(ext_parser, ext_parser);

+ resumable = XML_TRUE;

+ buffer = XML_GetBuffer(ext_parser, parse_len);

+ if (buffer == NULL)

+ fail("Could not allocate parse buffer");

+ memcpy(buffer, fault->parse_text, parse_len);

+ if (XML_ParseBuffer(ext_parser, parse_len,

+ XML_FALSE) != XML_STATUS_SUSPENDED)

+ fail("XML declaration did not suspend");

+ if (XML_ResumeParser(ext_parser) != XML_STATUS_OK)

+ xml_failure(ext_parser);

+ if (XML_ParseBuffer(ext_parser, 0, XML_TRUE) != XML_STATUS_ERROR)

+ fail(fault->fail_text);

+ if (XML_GetErrorCode(ext_parser) != fault->error)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_ERROR;

+START_TEST(test_ext_entity_invalid_suspended_parse)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtFaults faults[] = {

+ {

+ "<?xml version='1.0' encoding='us-ascii'?><",

+ "Incomplete element declaration not faulted",

+ NULL,

+ XML_ERROR_UNCLOSED_TOKEN

+ },

+ {

+ /* First two bytes of a three-byte char */

+ "<?xml version='1.0' encoding='utf-8'?>\xe2\x82",

+ "Incomplete character not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ { NULL, NULL, NULL, XML_ERROR_NONE }

+ };

+ ExtFaults *fault;

+ for (fault = &faults[0]; fault->parse_text != NULL; fault++) {

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_suspending_faulter);

+ XML_SetUserData(parser, fault);

+ expect_failure(text,

+ XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Parser did not report external entity error");

+ XML_ParserReset(parser, NULL);

+ }

+END_TEST

+/* Test setting an explicit encoding */

+START_TEST(test_explicit_encoding)

+ const char *text1 = "<doc>Hello ";

+ const char *text2 = " World</doc>";

+ /* Just check that we can set the encoding to NULL before starting */

+ if (XML_SetEncoding(parser, NULL) != XML_STATUS_OK)

+ fail("Failed to initialise encoding to NULL");

+ /* Say we are UTF-8 */

+ if (XML_SetEncoding(parser, XCS("utf-8")) != XML_STATUS_OK)

+ fail("Failed to set explicit encoding");

+ if (_XML_Parse_SINGLE_BYTES(parser, text1, (int)strlen(text1),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Try to switch encodings mid-parse */

+ if (XML_SetEncoding(parser, XCS("us-ascii")) != XML_STATUS_ERROR)

+ fail("Allowed encoding change");

+ if (_XML_Parse_SINGLE_BYTES(parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Try now the parse is over */

+ if (XML_SetEncoding(parser, NULL) != XML_STATUS_OK)

+ fail("Failed to unset encoding");

+END_TEST

+/* Test handling of trailing CR (rather than newline) */

+static void XMLCALL

+cr_cdata_handler(void *userData, const XML_Char *s, int len)

+ int *pfound = (int *)userData;

+ /* Internal processing turns the CR into a newline for the

+ * character data handler, but not for the default handler

+ */

+ if (len == 1 && (*s == XCS('\n') || *s == XCS('\r')))

+ *pfound = 1;

+START_TEST(test_trailing_cr)

+ const char *text = "<doc>\r";

+ int found_cr;

+ /* Try with a character handler, for code coverage */

+ XML_SetCharacterDataHandler(parser, cr_cdata_handler);

+ XML_SetUserData(parser, &found_cr);

+ found_cr = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Failed to fault unclosed doc");

+ if (found_cr == 0)

+ fail("Did not catch the carriage return");

+ XML_ParserReset(parser, NULL);

+ /* Now with a default handler instead */

+ XML_SetDefaultHandler(parser, cr_cdata_handler);

+ XML_SetUserData(parser, &found_cr);

+ found_cr = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Failed to fault unclosed doc");

+ if (found_cr == 0)

+ fail("Did not catch default carriage return");

+END_TEST

+/* Test trailing CR in an external entity parse */

+static int XMLCALL

+external_entity_cr_catcher(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "\r";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetCharacterDataHandler(ext_parser, cr_cdata_handler);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+static int XMLCALL

+external_entity_bad_cr_catcher(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<tag>\r";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetCharacterDataHandler(ext_parser, cr_cdata_handler);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Async entity error not caught");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_ASYNC_ENTITY)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_trailing_cr)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ int found_cr;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_cr_catcher);

+ XML_SetUserData(parser, &found_cr);

+ found_cr = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_OK)

+ xml_failure(parser);

+ if (found_cr == 0)

+ fail("No carriage return found");

+ XML_ParserReset(parser, NULL);

+ /* Try again with a different trailing CR */

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_bad_cr_catcher);

+ XML_SetUserData(parser, &found_cr);

+ found_cr = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_OK)

+ xml_failure(parser);

+ if (found_cr == 0)

+ fail("No carriage return found");

+END_TEST

+/* Test handling of trailing square bracket */

+static void XMLCALL

+rsqb_handler(void *userData, const XML_Char *s, int len)

+ int *pfound = (int *)userData;

+ if (len == 1 && *s == XCS(']'))

+ *pfound = 1;

+START_TEST(test_trailing_rsqb)

+ const char *text8 = "<doc>]";

+ const char text16[] = "\xFF\xFE<\000d\000o\000c\000>\000]\000";

+ int found_rsqb;

+ int text8_len = (int)strlen(text8);

+ XML_SetCharacterDataHandler(parser, rsqb_handler);

+ XML_SetUserData(parser, &found_rsqb);

+ found_rsqb = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text8, text8_len,

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Failed to fault unclosed doc");

+ if (found_rsqb == 0)

+ fail("Did not catch the right square bracket");

+ /* Try again with a different encoding */

+ XML_ParserReset(parser, NULL);

+ XML_SetCharacterDataHandler(parser, rsqb_handler);

+ XML_SetUserData(parser, &found_rsqb);

+ found_rsqb = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text16, (int)sizeof(text16)-1,

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Failed to fault unclosed doc");

+ if (found_rsqb == 0)

+ fail("Did not catch the right square bracket");

+ /* And finally with a default handler */

+ XML_ParserReset(parser, NULL);

+ XML_SetDefaultHandler(parser, rsqb_handler);

+ XML_SetUserData(parser, &found_rsqb);

+ found_rsqb = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text16, (int)sizeof(text16)-1,

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Failed to fault unclosed doc");

+ if (found_rsqb == 0)

+ fail("Did not catch the right square bracket");

+END_TEST

+/* Test trailing right square bracket in an external entity parse */

+static int XMLCALL

+external_entity_rsqb_catcher(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<tag>]";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetCharacterDataHandler(ext_parser, rsqb_handler);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Async entity error not caught");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_ASYNC_ENTITY)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_trailing_rsqb)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ int found_rsqb;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_rsqb_catcher);

+ XML_SetUserData(parser, &found_rsqb);

+ found_rsqb = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_OK)

+ xml_failure(parser);

+ if (found_rsqb == 0)

+ fail("No right square bracket found");

+END_TEST

+/* Test CDATA handling in an external entity */

+static int XMLCALL

+external_entity_good_cdata_ascii(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text =

+ "<a><![CDATA[<greeting>Hello, world!</greeting>]]></a>";

+ const XML_Char *expected = XCS("<greeting>Hello, world!</greeting>");

+ CharData storage;

+ XML_Parser ext_parser;

+ CharData_Init(&storage);

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ XML_SetUserData(ext_parser, &storage);

+ XML_SetCharacterDataHandler(ext_parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ CharData_CheckXMLChars(&storage, expected);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_good_cdata)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_good_cdata_ascii);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_OK)

+ xml_failure(parser);

+END_TEST

+/* Test user parameter settings */

+/* Variable holding the expected handler userData */

+static void *handler_data = NULL;

+/* Count of the number of times the comment handler has been invoked */

+static int comment_count = 0;

+/* Count of the number of skipped entities */

+static int skip_count = 0;

+/* Count of the number of times the XML declaration handler is invoked */

+static int xdecl_count = 0;

+static void XMLCALL

+xml_decl_handler(void *userData,

+ const XML_Char *UNUSED_P(version),

+ const XML_Char *UNUSED_P(encoding),

+ int standalone)

+ if (userData != handler_data)

+ fail("User data (xml decl) not correctly set");

+ if (standalone != -1)

+ fail("Standalone not flagged as not present in XML decl");

+ xdecl_count++;

+static void XMLCALL

+param_check_skip_handler(void *userData,

+ const XML_Char *UNUSED_P(entityName),

+ int UNUSED_P(is_parameter_entity))

+ if (userData != handler_data)

+ fail("User data (skip) not correctly set");

+ skip_count++;

+static void XMLCALL

+data_check_comment_handler(void *userData, const XML_Char *UNUSED_P(data))

+ /* Check that the userData passed through is what we expect */

+ if (userData != handler_data)

+ fail("User data (parser) not correctly set");

+ /* Check that the user data in the parser is appropriate */

+ if (XML_GetUserData(userData) != (void *)1)

+ fail("User data in parser not correctly set");

+ comment_count++;

+static int XMLCALL

+external_entity_param_checker(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text =

+ "\n"

+ "<!ELEMENT doc (#PCDATA)*>";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ handler_data = ext_parser;

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(parser);

+ return XML_STATUS_ERROR;

+ }

+ handler_data = parser;

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_user_parameters)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;";

+ const char *epilog =

+ "\n"

+ "</doc>";

+ comment_count = 0;

+ skip_count = 0;

+ xdecl_count = 0;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetXmlDeclHandler(parser, xml_decl_handler);

+ XML_SetExternalEntityRefHandler(parser, external_entity_param_checker);

+ XML_SetCommentHandler(parser, data_check_comment_handler);

+ XML_SetSkippedEntityHandler(parser, param_check_skip_handler);

+ XML_UseParserAsHandlerArg(parser);

+ XML_SetUserData(parser, (void *)1);

+ handler_data = parser;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (comment_count != 2)

+ fail("Comment handler not invoked enough times");

+ /* Ensure we can't change policy mid-parse */

+ if (XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_NEVER))

+ fail("Changed param entity parsing policy while parsing");

+ if (_XML_Parse_SINGLE_BYTES(parser, epilog, (int)strlen(epilog),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (comment_count != 3)

+ fail("Comment handler not invoked enough times");

+ if (skip_count != 1)

+ fail("Skip handler not invoked enough times");

+ if (xdecl_count != 1)

+ fail("XML declaration handler not invoked");

+END_TEST

+/* Test that an explicit external entity handler argument replaces

+ * the parser as the first argument.

+ *

+ * We do not call the first parameter to the external entity handler

+ * 'parser' for once, since the first time the handler is called it

+ * will actually be a text string. We need to be able to access the

+ * global 'parser' variable to create our external entity parser from,

+ * since there are code paths we need to ensure get executed.

+ */

+static int XMLCALL

+external_entity_ref_param_checker(XML_Parser parameter,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<!ELEMENT doc (#PCDATA)*>";

+ XML_Parser ext_parser;

+ if ((void *)parameter != handler_data)

+ fail("External entity ref handler parameter not correct");

+ /* Here we use the global 'parser' variable */

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_ref_parameter)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_ref_param_checker);

+ /* Set a handler arg that is not NULL and not parser (which is

+ * what NULL would cause to be passed.

+ */

+ XML_SetExternalEntityRefHandlerArg(parser, (void *)text);

+ handler_data = (void *)text;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Now try again with unset args */

+ XML_ParserReset(parser, NULL);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_ref_param_checker);

+ XML_SetExternalEntityRefHandlerArg(parser, NULL);

+ handler_data = (void *)parser;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test the parsing of an empty string */

+START_TEST(test_empty_parse)

+ const char *text = "<doc></doc>";

+ const char *partial = "<doc>";

+ if (XML_Parse(parser, NULL, 0, XML_FALSE) == XML_STATUS_ERROR)

+ fail("Parsing empty string faulted");

+ if (XML_Parse(parser, NULL, 0, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Parsing final empty string not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_NO_ELEMENTS)

+ fail("Parsing final empty string faulted for wrong reason");

+ /* Now try with valid text before the empty end */

+ XML_ParserReset(parser, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (XML_Parse(parser, NULL, 0, XML_TRUE) == XML_STATUS_ERROR)

+ fail("Parsing final empty string faulted");

+ /* Now try with invalid text before the empty end */

+ XML_ParserReset(parser, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, partial, (int)strlen(partial),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (XML_Parse(parser, NULL, 0, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Parsing final incomplete empty string not faulted");

+END_TEST

+/* Test odd corners of the XML_GetBuffer interface */

+static enum XML_Status

+get_feature(enum XML_FeatureEnum feature_id, long *presult)

+ const XML_Feature *feature = XML_GetFeatureList();

+ if (feature == NULL)

+ return XML_STATUS_ERROR;

+ for (; feature->feature != XML_FEATURE_END; feature++) {

+ if (feature->feature == feature_id) {

+ *presult = feature->value;

+ return XML_STATUS_OK;

+ }

+ return XML_STATUS_ERROR;

+/* Having an element name longer than 1024 characters exercises some

+ * of the pool allocation code in the parser that otherwise does not

+ * get executed. The count at the end of the line is the number of

+ * characters (bytes) in the element name by that point.x

+ */

+static const char *get_buffer_test_text =

+ "<documentwitharidiculouslylongelementnametotease" /* 0x030 */

+ "aparticularcorneroftheallocationinXML_GetBuffers" /* 0x060 */

+ "othatwecanimprovethecoverageyetagain012345678901" /* 0x090 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x0c0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x0f0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x120 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x150 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x180 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x1b0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x1e0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x210 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x240 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x270 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x2a0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x2d0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x300 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x330 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x360 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x390 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x3c0 */

+ "123456789abcdef0123456789abcdef0123456789abcdef0" /* 0x3f0 */

+ "123456789abcdef0123456789abcdef0123456789>\n<ef0"; /* 0x420 */

+/* Test odd corners of the XML_GetBuffer interface */

+START_TEST(test_get_buffer_1)

+ const char *text = get_buffer_test_text;

+ void *buffer;

+ long context_bytes;

+ /* Attempt to allocate a negative length buffer */

+ if (XML_GetBuffer(parser, -12) != NULL)

+ fail("Negative length buffer not failed");

+ /* Now get a small buffer and extend it past valid length */

+ buffer = XML_GetBuffer(parser, 1536);

+ if (buffer == NULL)

+ fail("1.5K buffer failed");

+ memcpy(buffer, text, strlen(text));

+ if (XML_ParseBuffer(parser, (int)strlen(text), XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (XML_GetBuffer(parser, INT_MAX) != NULL)

+ fail("INT_MAX buffer not failed");

+ /* Now try extending it a more reasonable but still too large

+ * amount. The allocator in XML_GetBuffer() doubles the buffer

+ * size until it exceeds the requested amount or INT_MAX. If it

+ * exceeds INT_MAX, it rejects the request, so we want a request

+ * between INT_MAX and INT_MAX/2. A gap of 1K seems comfortable,

+ * with an extra byte just to ensure that the request is off any

+ * boundary. The request will be inflated internally by

+ * XML_CONTEXT_BYTES (if defined), so we subtract that from our

+ * request.

+ */

+ if (get_feature(XML_FEATURE_CONTEXT_BYTES,

+ &context_bytes) != XML_STATUS_OK)

+ context_bytes = 0;

+ if (XML_GetBuffer(parser, INT_MAX - (context_bytes + 1025)) != NULL)

+ fail("INT_MAX- buffer not failed");

+ /* Now try extending it a carefully crafted amount */

+ if (XML_GetBuffer(parser, 1000) == NULL)

+ fail("1000 buffer failed");

+END_TEST

+/* Test more corners of the XML_GetBuffer interface */

+START_TEST(test_get_buffer_2)

+ const char *text = get_buffer_test_text;

+ void *buffer;

+ /* Now get a decent buffer */

+ buffer = XML_GetBuffer(parser, 1536);

+ if (buffer == NULL)

+ fail("1.5K buffer failed");

+ memcpy(buffer, text, strlen(text));

+ if (XML_ParseBuffer(parser, (int)strlen(text), XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Extend it, to catch a different code path */

+ if (XML_GetBuffer(parser, 1024) == NULL)

+ fail("1024 buffer failed");

+END_TEST

+/* Test position information macros */

+START_TEST(test_byte_info_at_end)

+ const char *text = "<doc></doc>";

+ if (XML_GetCurrentByteIndex(parser) != -1 ||

+ XML_GetCurrentByteCount(parser) != 0)

+ fail("Byte index/count incorrect at start of parse");

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* At end, the count will be zero and the index the end of string */

+ if (XML_GetCurrentByteCount(parser) != 0)

+ fail("Terminal byte count incorrect");

+ if (XML_GetCurrentByteIndex(parser) != (XML_Index)strlen(text))

+ fail("Terminal byte index incorrect");

+END_TEST

+/* Test position information from errors */

+#define PRE_ERROR_STR "<doc></"

+#define POST_ERROR_STR "wombat></doc>"

+START_TEST(test_byte_info_at_error)

+ const char *text = PRE_ERROR_STR POST_ERROR_STR;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ fail("Syntax error not faulted");

+ if (XML_GetCurrentByteCount(parser) != 0)

+ fail("Error byte count incorrect");

+ if (XML_GetCurrentByteIndex(parser) != strlen(PRE_ERROR_STR))

+ fail("Error byte index incorrect");

+END_TEST

+#undef PRE_ERROR_STR

+#undef POST_ERROR_STR

+/* Test position information in handler */

+typedef struct ByteTestData {

+ int start_element_len;

+ int cdata_len;

+ int total_string_len;

+} ByteTestData;

+static void

+byte_character_handler(void *userData,

+ const XML_Char *UNUSED_P(s),

+ int len)

+#ifdef XML_CONTEXT_BYTES

+ int offset, size;

+ const char *buffer;

+ ByteTestData *data = (ByteTestData *)userData;

+ buffer = XML_GetInputContext(parser, &offset, &size);

+ if (buffer == NULL)

+ fail("Failed to get context buffer");

+ if (offset != data->start_element_len)

+ fail("Context offset in unexpected position");

+ if (len != data->cdata_len)

+ fail("CDATA length reported incorrectly");

+ if (size != data->total_string_len)

+ fail("Context size is not full buffer");

+ if (XML_GetCurrentByteIndex(parser) != offset)

+ fail("Character byte index incorrect");

+ if (XML_GetCurrentByteCount(parser) != len)

+ fail("Character byte count incorrect");

+#else

+ (void)userData;

+ (void)len;

+#endif

+#define START_ELEMENT "<e>"

+#define CDATA_TEXT "Hello"

+#define END_ELEMENT "</e>"

+START_TEST(test_byte_info_at_cdata)

+ const char *text = START_ELEMENT CDATA_TEXT END_ELEMENT;

+ int offset, size;

+ ByteTestData data;

+ /* Check initial context is empty */

+ if (XML_GetInputContext(parser, &offset, &size) != NULL)

+ fail("Unexpected context at start of parse");

+ data.start_element_len = (int)strlen(START_ELEMENT);

+ data.cdata_len = (int)strlen(CDATA_TEXT);

+ data.total_string_len = (int)strlen(text);

+ XML_SetCharacterDataHandler(parser, byte_character_handler);

+ XML_SetUserData(parser, &data);

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_OK)

+ xml_failure(parser);

+END_TEST

+#undef START_ELEMENT

+#undef CDATA_TEXT

+#undef END_ELEMENT

+/* Test predefined entities are correctly recognised */

+START_TEST(test_predefined_entities)

+ const char *text = "<doc><>&"'</doc>";

+ const XML_Char *expected = XCS("<doc><>&"'</doc>");

+ const XML_Char *result = XCS("<>&\"'");

+ CharData storage;

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ /* run_character_check uses XML_SetCharacterDataHandler(), which

+ * unfortunately heads off a code path that we need to exercise.

+ */

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* The default handler doesn't translate the entities */

+ CharData_CheckXMLChars(&storage, expected);

+ /* Now try again and check the translation */

+ XML_ParserReset(parser, NULL);

+ run_character_check(text, result);

+END_TEST

+/* Regression test that an invalid tag in an external parameter

+ * reference in an external DTD is correctly faulted.

+ *

+ * Only a few specific tags are legal in DTDs ignoring comments and

+ * processing instructions, all of which begin with an exclamation

+ * mark. "<el/>" is not one of them, so the parser should raise an

+ * error on encountering it.

+ */

+static int XMLCALL

+external_entity_param(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ const char *text1 =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 SYSTEM '004-2.ent'>\n"

+ "<!ENTITY % e2 '%e1;'>\n"

+ "%e1;\n";

+ const char *text2 =

+ "<!ELEMENT el EMPTY>\n"

+ "<el/>\n";

+ XML_Parser ext_parser;

+ if (systemId == NULL)

+ return XML_STATUS_OK;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (!xcstrcmp(systemId, XCS("004-1.ent"))) {

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text1, (int)strlen(text1),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Inner DTD with invalid tag not rejected");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_EXTERNAL_ENTITY_HANDLING)

+ xml_failure(ext_parser);

+ }

+ else if (!xcstrcmp(systemId, XCS("004-2.ent"))) {

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text2, (int)strlen(text2),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Invalid tag in external param not rejected");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_SYNTAX)

+ xml_failure(ext_parser);

+ } else {

+ fail("Unknown system ID");

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_ERROR;

+START_TEST(test_invalid_tag_in_dtd)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM '004-1.ent'>\n"

+ "<doc></doc>\n";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_param);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Invalid tag IN DTD external param not rejected");

+END_TEST

+/* Test entities not quite the predefined ones are not mis-recognised */

+START_TEST(test_not_predefined_entities)

+ const char *text[] = {

+ "<doc>&pt;</doc>",

+ "<doc>&amo;</doc>",

+ "<doc>&quid;</doc>",

+ "<doc>&apod;</doc>",

+ NULL

+ };

+ int i = 0;

+ while (text[i] != NULL) {

+ expect_failure(text[i], XML_ERROR_UNDEFINED_ENTITY,

+ "Undefined entity not rejected");

+ XML_ParserReset(parser, NULL);

+ i++;

+ }

+END_TEST

+/* Test conditional inclusion (IGNORE) */

+static int XMLCALL

+external_entity_load_ignore(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = "<![IGNORE[<!ELEMENT e (#PCDATA)*>]]>";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ignore_section)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc><e>&entity;</e></doc>";

+ const XML_Char *expected =

+ XCS("<![IGNORE[<!ELEMENT e (#PCDATA)*>]]>\n&entity;");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &storage);

+ XML_SetExternalEntityRefHandler(parser, external_entity_load_ignore);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetStartDoctypeDeclHandler(parser, dummy_start_doctype_handler);

+ XML_SetEndDoctypeDeclHandler(parser, dummy_end_doctype_handler);

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ XML_SetStartElementHandler(parser, dummy_start_element);

+ XML_SetEndElementHandler(parser, dummy_end_element);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+static int XMLCALL

+external_entity_load_ignore_utf16(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char text[] =

+ /* <![IGNORE[<!ELEMENT e (#PCDATA)*>]]> */

+ "<\0!\0[\0I\0G\0N\0O\0R\0E\0[\0"

+ "<\0!\0E\0L\0E\0M\0E\0N\0T\0 \0e\0 \0"

+ "(\0#\0P\0C\0D\0A\0T\0A\0)\0*\0>\0]\0]\0>\0";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ignore_section_utf16)

+ const char text[] =

+ /* <!DOCTYPE d SYSTEM 's'> */

+ "<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0 "

+ "\0S\0Y\0S\0T\0E\0M\0 \0'\0s\0'\0>\0\n\0"

+ /* <d><e>&en;</e></d> */

+ "<\0d\0>\0<\0e\0>\0&\0e\0n\0;\0<\0/\0e\0>\0<\0/\0d\0>\0";

+ const XML_Char *expected =

+ XCS("<![IGNORE[<!ELEMENT e (#PCDATA)*>]]>\n&en;");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &storage);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_load_ignore_utf16);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetStartDoctypeDeclHandler(parser, dummy_start_doctype_handler);

+ XML_SetEndDoctypeDeclHandler(parser, dummy_end_doctype_handler);

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ XML_SetStartElementHandler(parser, dummy_start_element);

+ XML_SetEndElementHandler(parser, dummy_end_element);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+static int XMLCALL

+external_entity_load_ignore_utf16_be(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char text[] =

+ /* <![IGNORE[<!ELEMENT e (#PCDATA)*>]]> */

+ "\0<\0!\0[\0I\0G\0N\0O\0R\0E\0["

+ "\0<\0!\0E\0L\0E\0M\0E\0N\0T\0 \0e\0 "

+ "\0(\0#\0P\0C\0D\0A\0T\0A\0)\0*\0>\0]\0]\0>";

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ignore_section_utf16_be)

+ const char text[] =

+ /* <!DOCTYPE d SYSTEM 's'> */

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0 "

+ "\0S\0Y\0S\0T\0E\0M\0 \0'\0s\0'\0>\0\n"

+ /* <d><e>&en;</e></d> */

+ "\0<\0d\0>\0<\0e\0>\0&\0e\0n\0;\0<\0/\0e\0>\0<\0/\0d\0>";

+ const XML_Char *expected =

+ XCS("<![IGNORE[<!ELEMENT e (#PCDATA)*>]]>\n&en;");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &storage);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_load_ignore_utf16_be);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetStartDoctypeDeclHandler(parser, dummy_start_doctype_handler);

+ XML_SetEndDoctypeDeclHandler(parser, dummy_end_doctype_handler);

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ XML_SetStartElementHandler(parser, dummy_start_element);

+ XML_SetEndElementHandler(parser, dummy_end_element);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test mis-formatted conditional exclusion */

+START_TEST(test_bad_ignore_section)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc><e>&entity;</e></doc>";

+ ExtFaults faults[] = {

+ {

+ "<![IGNORE[<!ELEM",

+ "Broken-off declaration not faulted",

+ NULL,

+ XML_ERROR_SYNTAX

+ },

+ {

+ "<![IGNORE[\x01]]>",

+ "Invalid XML character not faulted",

+ NULL,

+ XML_ERROR_INVALID_TOKEN

+ },

+ {

+ /* FIrst two bytes of a three-byte char */

+ "<![IGNORE[\xe2\x82",

+ "Partial XML character not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ { NULL, NULL, NULL, XML_ERROR_NONE }

+ };

+ ExtFaults *fault;

+ for (fault = &faults[0]; fault->parse_text != NULL; fault++) {

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, fault);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Incomplete IGNORE section not failed");

+ XML_ParserReset(parser, NULL);

+ }

+END_TEST

+/* Test recursive parsing */

+static int XMLCALL

+external_entity_valuer(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ const char *text1 =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 SYSTEM '004-2.ent'>\n"

+ "<!ENTITY % e2 '%e1;'>\n"

+ "%e1;\n";

+ XML_Parser ext_parser;

+ if (systemId == NULL)

+ return XML_STATUS_OK;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (!xcstrcmp(systemId, XCS("004-1.ent"))) {

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text1, (int)strlen(text1),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ }

+ else if (!xcstrcmp(systemId, XCS("004-2.ent"))) {

+ ExtFaults *fault = (ExtFaults *)XML_GetUserData(parser);

+ enum XML_Status status;

+ enum XML_Error error;

+ status = _XML_Parse_SINGLE_BYTES(ext_parser,

+ fault->parse_text,

+ (int)strlen(fault->parse_text),

+ XML_TRUE);

+ if (fault->error == XML_ERROR_NONE) {

+ if (status == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ } else {

+ if (status != XML_STATUS_ERROR)

+ fail(fault->fail_text);

+ error = XML_GetErrorCode(ext_parser);

+ if (error != fault->error &&

+ (fault->error != XML_ERROR_XML_DECL ||

+ error != XML_ERROR_TEXT_DECL))

+ xml_failure(ext_parser);

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_external_entity_values)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM '004-1.ent'>\n"

+ "<doc></doc>\n";

+ ExtFaults data_004_2[] = {

+ {

+ "<!ATTLIST doc a1 CDATA 'value'>",

+ NULL,

+ XML_ERROR_NONE

+ },

+ {

+ "<!ATTLIST $doc a1 CDATA 'value'>",

+ "Invalid token not faulted",

+ NULL,

+ XML_ERROR_INVALID_TOKEN

+ },

+ {

+ "'wombat",

+ "Unterminated string not faulted",

+ NULL,

+ XML_ERROR_UNCLOSED_TOKEN

+ },

+ {

+ "\xe2\x82",

+ "Partial UTF-8 character not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ {

+ "<?xml version='1.0' encoding='utf-8'?>\n",

+ NULL,

+ XML_ERROR_NONE

+ },

+ {

+ "<?xml?>",

+ "Malformed XML declaration not faulted",

+ NULL,

+ XML_ERROR_XML_DECL

+ },

+ {

+ /* UTF-8 BOM */

+ "\xEF\xBB\xBF<!ATTLIST doc a1 CDATA 'value'>",

+ NULL,

+ XML_ERROR_NONE

+ },

+ {

+ "<?xml version='1.0' encoding='utf-8'?>\n$",

+ "Invalid token after text declaration not faulted",

+ NULL,

+ XML_ERROR_INVALID_TOKEN

+ },

+ {

+ "<?xml version='1.0' encoding='utf-8'?>\n'wombat",

+ "Unterminated string after text decl not faulted",

+ NULL,

+ XML_ERROR_UNCLOSED_TOKEN

+ },

+ {

+ "<?xml version='1.0' encoding='utf-8'?>\n\xe2\x82",

+ "Partial UTF-8 character after text decl not faulted",

+ NULL,

+ XML_ERROR_PARTIAL_CHAR

+ },

+ {

+ "%e1;",

+ "Recursive parameter entity not faulted",

+ NULL,

+ XML_ERROR_RECURSIVE_ENTITY_REF

+ },

+ { NULL, NULL, NULL, XML_ERROR_NONE }

+ };

+ int i;

+ for (i = 0; data_004_2[i].parse_text != NULL; i++) {

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_valuer);

+ XML_SetUserData(parser, &data_004_2[i]);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ XML_ParserReset(parser, NULL);

+ }

+END_TEST

+/* Test the recursive parse interacts with a not standalone handler */

+static int XMLCALL

+external_entity_not_standalone(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ const char *text1 =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 SYSTEM 'bar'>\n"

+ "%e1;\n";

+ const char *text2 = "<!ATTLIST doc a1 CDATA 'value'>";

+ XML_Parser ext_parser;

+ if (systemId == NULL)

+ return XML_STATUS_OK;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (!xcstrcmp(systemId, XCS("foo"))) {

+ XML_SetNotStandaloneHandler(ext_parser,

+ reject_not_standalone_handler);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text1, (int)strlen(text1),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Expected not standalone rejection");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_NOT_STANDALONE)

+ xml_failure(ext_parser);

+ XML_SetNotStandaloneHandler(ext_parser, NULL);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_ERROR;

+ }

+ else if (!xcstrcmp(systemId, XCS("bar"))) {

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_not_standalone)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc></doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_not_standalone);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Standalone rejection not caught");

+END_TEST

+static int XMLCALL

+external_entity_value_aborter(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ const char *text1 =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 SYSTEM '004-2.ent'>\n"

+ "<!ENTITY % e2 '%e1;'>\n"

+ "%e1;\n";

+ const char *text2 =

+ "<?xml version='1.0' encoding='utf-8'?>";

+ XML_Parser ext_parser;

+ if (systemId == NULL)

+ return XML_STATUS_OK;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ if (!xcstrcmp(systemId, XCS("004-1.ent"))) {

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text1, (int)strlen(text1),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ }

+ if (!xcstrcmp(systemId, XCS("004-2.ent"))) {

+ XML_SetXmlDeclHandler(ext_parser, entity_suspending_xdecl_handler);

+ XML_SetUserData(ext_parser, ext_parser);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text2, (int)strlen(text2),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Aborted parse not faulted");

+ if (XML_GetErrorCode(ext_parser) != XML_ERROR_ABORTED)

+ xml_failure(ext_parser);

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_ext_entity_value_abort)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM '004-1.ent'>\n"

+ "<doc></doc>\n";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_value_aborter);

+ resumable = XML_FALSE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_bad_public_doctype)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<!DOCTYPE doc PUBLIC '{BadName}' 'test'>\n"

+ "<doc></doc>";

+ /* Setting a handler provokes a particular code path */

+ XML_SetDoctypeDeclHandler(parser,

+ dummy_start_doctype_handler,

+ dummy_end_doctype_handler);

+ expect_failure(text, XML_ERROR_PUBLICID, "Bad Public ID not failed");

+END_TEST

+/* Test based on ibm/valid/P32/ibm32v04.xml */

+START_TEST(test_attribute_enum_value)

+ const char *text =

+ "<?xml version='1.0' standalone='no'?>\n"

+ "<!DOCTYPE animal SYSTEM 'test.dtd'>\n"

+ "<animal>This is a \n <a/> \n\nyellow tiger</animal>";

+ ExtTest dtd_data = {

+ "<!ELEMENT animal (#PCDATA|a)*>\n"

+ "<!ELEMENT a EMPTY>\n"

+ "<!ATTLIST animal xml:space (default|preserve) 'preserve'>",

+ NULL,

+ NULL

+ };

+ const XML_Char *expected = XCS("This is a \n \n\nyellow tiger");

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetUserData(parser, &dtd_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ /* An attribute list handler provokes a different code path */

+ XML_SetAttlistDeclHandler(parser, dummy_attlist_decl_handler);

+ run_ext_character_check(text, &dtd_data, expected);

+END_TEST

+/* Slightly bizarrely, the library seems to silently ignore entity

+ * definitions for predefined entities, even when they are wrong. The

+ * language of the XML 1.0 spec is somewhat unhelpful as to what ought

+ * to happen, so this is currently treated as acceptable.

+ */

+START_TEST(test_predefined_entity_redefinition)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY apos 'foo'>\n"

+ "]>\n"

+ "<doc>'</doc>";

+ run_character_check(text, XCS("'"));

+END_TEST

+/* Test that the parser stops processing the DTD after an unresolved

+ * parameter entity is encountered.

+ */

+START_TEST(test_dtd_stop_processing)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "%foo;\n"

+ "<!ENTITY bar 'bas'>\n"

+ "]><doc/>";

+ XML_SetEntityDeclHandler(parser, dummy_entity_decl_handler);

+ dummy_handler_flags = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (dummy_handler_flags != 0)

+ fail("DTD processing still going after undefined PE");

+END_TEST

+/* Test public notations with no system ID */

+START_TEST(test_public_notation_no_sysid)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!NOTATION note PUBLIC 'foo'>\n"

+ "<!ELEMENT doc EMPTY>\n"

+ "]>\n<doc/>";

+ dummy_handler_flags = 0;

+ XML_SetNotationDeclHandler(parser, dummy_notation_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (dummy_handler_flags != DUMMY_NOTATION_DECL_HANDLER_FLAG)

+ fail("Notation declaration handler not called");

+END_TEST

+static void XMLCALL

+record_element_start_handler(void *userData,

+ const XML_Char *name,

+ const XML_Char **UNUSED_P(atts))

+ CharData_AppendXMLChars((CharData *)userData, name, (int)xcstrlen(name));

+START_TEST(test_nested_groups)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc "

+ /* Sixteen elements per line */

+ "(e,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,"

+ "(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?,(e?"

+ "))))))))))))))))))))))))))))))))>\n"

+ "<!ELEMENT e EMPTY>"

+ "]>\n"

+ "<doc><e/></doc>";

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ XML_SetStartElementHandler(parser, record_element_start_handler);

+ XML_SetUserData(parser, &storage);

+ dummy_handler_flags = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS("doce"));

+ if (dummy_handler_flags != DUMMY_ELEMENT_DECL_HANDLER_FLAG)

+ fail("Element handler not fired");

+END_TEST

+START_TEST(test_group_choice)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc (a|b|c)+>\n"

+ "<!ELEMENT a EMPTY>\n"

+ "<!ELEMENT b (#PCDATA)>\n"

+ "<!ELEMENT c ANY>\n"

+ "]>\n"

+ "<doc>\n"

+ "<a/>\n"

+ "This is a foo\n"

+ "<c></c>\n"

+ "</doc>\n";

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ dummy_handler_flags = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (dummy_handler_flags != DUMMY_ELEMENT_DECL_HANDLER_FLAG)

+ fail("Element handler flag not raised");

+END_TEST

+static int XMLCALL

+external_entity_public(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *publicId)

+ const char *text1 = (const char *)XML_GetUserData(parser);

+ const char *text2 = "<!ATTLIST doc a CDATA 'value'>";

+ const char *text = NULL;

+ XML_Parser ext_parser;

+ int parse_res;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ return XML_STATUS_ERROR;

+ if (systemId != NULL && !xcstrcmp(systemId, XCS("http://example.org/"))) {

+ text = text1;

+ }

+ else if (publicId != NULL && !xcstrcmp(publicId, XCS("foo"))) {

+ text = text2;

+ }

+ else

+ fail("Unexpected parameters to external entity parser");

+ parse_res = _XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE);

+ XML_ParserFree(ext_parser);

+ return parse_res;

+START_TEST(test_standalone_parameter_entity)

+ const char *text =

+ "<?xml version='1.0' standalone='yes'?>\n"

+ "<!DOCTYPE doc SYSTEM 'http://example.org/' [\n"

+ "<!ENTITY % entity '<!ELEMENT doc (#PCDATA)>'>\n"

+ "%entity;\n"

+ "]>\n"

+ "<doc></doc>";

+ char dtd_data[] =

+ "<!ENTITY % e1 'foo'>\n";

+ XML_SetUserData(parser, dtd_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_public);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test skipping of parameter entity in an external DTD */

+/* Derived from ibm/invalid/P69/ibm69i01.xml */

+START_TEST(test_skipped_parameter_entity)

+ const char *text =

+ "<?xml version='1.0'?>\n"

+ "<!DOCTYPE root SYSTEM 'http://example.org/dtd.ent' [\n"

+ "<!ELEMENT root (#PCDATA|a)* >\n"

+ "]>\n"

+ "<root></root>";

+ ExtTest dtd_data = { "%pe2;", NULL, NULL };

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetUserData(parser, &dtd_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetSkippedEntityHandler(parser, dummy_skip_handler);

+ dummy_handler_flags = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (dummy_handler_flags != DUMMY_SKIP_HANDLER_FLAG)

+ fail("Skip handler not executed");

+END_TEST

+/* Test recursive parameter entity definition rejected in external DTD */

+START_TEST(test_recursive_external_parameter_entity)

+ const char *text =

+ "<?xml version='1.0'?>\n"

+ "<!DOCTYPE root SYSTEM 'http://example.org/dtd.ent' [\n"

+ "<!ELEMENT root (#PCDATA|a)* >\n"

+ "]>\n"

+ "<root></root>";

+ ExtFaults dtd_data = {

+ "<!ENTITY % pe2 '%pe2;'>\n%pe2;",

+ "Recursive external parameter entity not faulted",

+ NULL,

+ XML_ERROR_RECURSIVE_ENTITY_REF

+ };

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, &dtd_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ expect_failure(text,

+ XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Recursive external parameter not spotted");

+END_TEST

+/* Test undefined parameter entity in external entity handler */

+static int XMLCALL

+external_entity_devaluer(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *systemId,

+ const XML_Char *UNUSED_P(publicId))

+ const char *text =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 SYSTEM 'bar'>\n"

+ "%e1;\n";

+ XML_Parser ext_parser;

+ intptr_t clear_handler = (intptr_t)XML_GetUserData(parser);

+ if (systemId == NULL || !xcstrcmp(systemId, XCS("bar")))

+ return XML_STATUS_OK;

+ if (xcstrcmp(systemId, XCS("foo")))

+ fail("Unexpected system ID");

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could note create external entity parser");

+ if (clear_handler)

+ XML_SetExternalEntityRefHandler(ext_parser, NULL);

+ if (_XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(ext_parser);

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_undefined_ext_entity_in_external_dtd)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc></doc>\n";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_devaluer);

+ XML_SetUserData(parser, (void *)(intptr_t)XML_FALSE);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Now repeat without the external entity ref handler invoking

+ * another copy of itself.

+ */

+ XML_ParserReset(parser, NULL);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_devaluer);

+ XML_SetUserData(parser, (void *)(intptr_t)XML_TRUE);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+static void XMLCALL

+aborting_xdecl_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(version),

+ const XML_Char *UNUSED_P(encoding),

+ int UNUSED_P(standalone))

+ XML_StopParser(parser, resumable);

+ XML_SetXmlDeclHandler(parser, NULL);

+/* Test suspending the parse on receiving an XML declaration works */

+START_TEST(test_suspend_xdecl)

+ const char *text = long_character_data_text;

+ XML_SetXmlDeclHandler(parser, aborting_xdecl_handler);

+ resumable = XML_TRUE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+ if (XML_GetErrorCode(parser) != XML_ERROR_NONE)

+ xml_failure(parser);

+ /* Attempt to start a new parse while suspended */

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ fail("Attempt to parse while suspended not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_SUSPENDED)

+ fail("Suspended parse not faulted with correct error");

+END_TEST

+/* Test aborting the parse in an epilog works */

+static void XMLCALL

+selective_aborting_default_handler(void *userData,

+ const XML_Char *s,

+ int len)

+ const XML_Char *match = (const XML_Char *)userData;

+ if (match == NULL ||

+ (xcstrlen(match) == (unsigned)len &&

+ !xcstrncmp(match, s, len))) {

+ XML_StopParser(parser, resumable);

+ XML_SetDefaultHandler(parser, NULL);

+ }

+START_TEST(test_abort_epilog)

+ const char *text = "<doc></doc>\n\r\n";

+ XML_Char match[] = XCS("\r");

+ XML_SetDefaultHandler(parser, selective_aborting_default_handler);

+ XML_SetUserData(parser, match);

+ resumable = XML_FALSE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Abort not triggered");

+ if (XML_GetErrorCode(parser) != XML_ERROR_ABORTED)

+ xml_failure(parser);

+END_TEST

+/* Test a different code path for abort in the epilog */

+START_TEST(test_abort_epilog_2)

+ const char *text = "<doc></doc>\n";

+ XML_Char match[] = XCS("\n");

+ XML_SetDefaultHandler(parser, selective_aborting_default_handler);

+ XML_SetUserData(parser, match);

+ resumable = XML_FALSE;

+ expect_failure(text, XML_ERROR_ABORTED, "Abort not triggered");

+END_TEST

+/* Test suspension from the epilog */

+START_TEST(test_suspend_epilog)

+ const char *text = "<doc></doc>\n";

+ XML_Char match[] = XCS("\n");

+ XML_SetDefaultHandler(parser, selective_aborting_default_handler);

+ XML_SetUserData(parser, match);

+ resumable = XML_TRUE;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+END_TEST

+static void XMLCALL

+suspending_end_handler(void *userData,

+ const XML_Char *UNUSED_P(s))

+ XML_StopParser((XML_Parser)userData, 1);

+START_TEST(test_suspend_in_sole_empty_tag)

+ const char *text = "<doc/>";

+ enum XML_Status rc;

+ XML_SetEndElementHandler(parser, suspending_end_handler);

+ XML_SetUserData(parser, parser);

+ rc = _XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE);

+ if (rc == XML_STATUS_ERROR)

+ xml_failure(parser);

+ else if (rc != XML_STATUS_SUSPENDED)

+ fail("Suspend not triggered");

+ rc = XML_ResumeParser(parser);

+ if (rc == XML_STATUS_ERROR)

+ xml_failure(parser);

+ else if (rc != XML_STATUS_OK)

+ fail("Resume failed");

+END_TEST

+START_TEST(test_unfinished_epilog)

+ const char *text = "<doc></doc><";

+ expect_failure(text, XML_ERROR_UNCLOSED_TOKEN,

+ "Incomplete epilog entry not faulted");

+END_TEST

+START_TEST(test_partial_char_in_epilog)

+ const char *text = "<doc></doc>\xe2\x82";

+ /* First check that no fault is raised if the parse is not finished */

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ /* Now check that it is faulted once we finish */

+ if (XML_ParseBuffer(parser, 0, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Partial character in epilog not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_PARTIAL_CHAR)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_hash_collision)

+ /* For full coverage of the lookup routine, we need to ensure a

+ * hash collision even though we can only tell that we have one

+ * through breakpoint debugging or coverage statistics. The

+ * following will cause a hash collision on machines with a 64-bit

+ * long type; others will have to experiment. The full coverage

+ * tests invoked from qa.sh usually provide a hash collision, but

+ * not always. This is an attempt to provide insurance.

+ */

+#define COLLIDING_HASH_SALT (unsigned long)_SIP_ULL(0xffffffffU, 0xff99fc90U)

+ const char * text =

+ "<doc>\n"

+ "<a1/><a2/><a3/><a4/><a5/><a6/><a7/><a8/>\n"

+ "<b1></b1><b2 attr='foo'>This is a foo</b2><b3></b3><b4></b4>\n"

+ "<b5></b5><b6></b6><b7></b7><b8></b8>\n"

+ "<c1/><c2/><c3/><c4/><c5/><c6/><c7/><c8/>\n"

+ "<d1/><d2/><d3/><d4/><d5/><d6/><d7/>\n"

+ "<d8>This triggers the table growth and collides with b2</d8>\n"

+ "</doc>\n";

+ XML_SetHashSalt(parser, COLLIDING_HASH_SALT);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+#undef COLLIDING_HASH_SALT

+/* Test resuming a parse suspended in entity substitution */

+static void XMLCALL

+start_element_suspender(void *UNUSED_P(userData),

+ const XML_Char *name,

+ const XML_Char **UNUSED_P(atts))

+ if (!xcstrcmp(name, XCS("suspend")))

+ XML_StopParser(parser, XML_TRUE);

+ if (!xcstrcmp(name, XCS("abort")))

+ XML_StopParser(parser, XML_FALSE);

+START_TEST(test_suspend_resume_internal_entity)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY foo '<suspend>Hi<suspend>Ho</suspend></suspend>'>\n"

+ "]>\n"

+ "<doc>&foo;</doc>\n";

+ const XML_Char *expected1 = XCS("Hi");

+ const XML_Char *expected2 = XCS("HiHo");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetStartElementHandler(parser, start_element_suspender);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ XML_SetUserData(parser, &storage);

+ if (XML_Parse(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS(""));

+ if (XML_ResumeParser(parser) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected1);

+ if (XML_ResumeParser(parser) != XML_STATUS_OK)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected2);

+END_TEST

+/* Test syntax error is caught at parse resumption */

+START_TEST(test_resume_entity_with_syntax_error)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY foo '<suspend>Hi</wombat>'>\n"

+ "]>\n"

+ "<doc>&foo;</doc>\n";

+ XML_SetStartElementHandler(parser, start_element_suspender);

+ if (XML_Parse(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+ if (XML_ResumeParser(parser) != XML_STATUS_ERROR)

+ fail("Syntax error in entity not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_TAG_MISMATCH)

+ xml_failure(parser);

+END_TEST

+/* Test suspending and resuming in a parameter entity substitution */

+static void XMLCALL

+element_decl_suspender(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(name),

+ XML_Content *model)

+ XML_StopParser(parser, XML_TRUE);

+ XML_FreeContentModel(parser, model);

+START_TEST(test_suspend_resume_parameter_entity)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY % foo '<!ELEMENT doc (#PCDATA)*>'>\n"

+ "%foo;\n"

+ "]>\n"

+ "<doc>Hello, world</doc>";

+ const XML_Char *expected = XCS("Hello, world");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetElementDeclHandler(parser, element_decl_suspender);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ XML_SetUserData(parser, &storage);

+ if (XML_Parse(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_SUSPENDED)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, XCS(""));

+ if (XML_ResumeParser(parser) != XML_STATUS_OK)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test attempting to use parser after an error is faulted */

+START_TEST(test_restart_on_error)

+ const char *text = "<$doc><doc></doc>";

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ fail("Invalid tag name not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_INVALID_TOKEN)

+ xml_failure(parser);

+ if (XML_Parse(parser, NULL, 0, XML_TRUE) != XML_STATUS_ERROR)

+ fail("Restarting invalid parse not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_INVALID_TOKEN)

+ xml_failure(parser);

+END_TEST

+/* Test that angle brackets in an attribute default value are faulted */

+START_TEST(test_reject_lt_in_attribute_value)

+ const char *text =

+ "<!DOCTYPE doc [<!ATTLIST doc a CDATA '<bar>'>]>\n"

+ "<doc></doc>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Bad attribute default not faulted");

+END_TEST

+START_TEST(test_reject_unfinished_param_in_att_value)

+ const char *text =

+ "<!DOCTYPE doc [<!ATTLIST doc a CDATA '&foo'>]>\n"

+ "<doc></doc>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Bad attribute default not faulted");

+END_TEST

+START_TEST(test_trailing_cr_in_att_value)

+ const char *text = "<doc a='value\r'/>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Try parsing a general entity within a parameter entity in a

+ * standalone internal DTD. Covers a corner case in the parser.

+ */

+START_TEST(test_standalone_internal_entity)

+ const char *text =

+ "<?xml version='1.0' standalone='yes' ?>\n"

+ "<!DOCTYPE doc [\n"

+ " <!ELEMENT doc (#PCDATA)>\n"

+ " <!ENTITY % pe '<!ATTLIST doc att2 CDATA \"≥\">'>\n"

+ " <!ENTITY ge 'AttDefaultValue'>\n"

+ " %pe;\n"

+ "]>\n"

+ "<doc att2='any'/>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test that a reference to an unknown external entity is skipped */

+START_TEST(test_skipped_external_entity)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/'>\n"

+ "<doc></doc>\n";

+ ExtTest test_data = {

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e2 '%e1;'>\n",

+ NULL,

+ NULL

+ };

+ XML_SetUserData(parser, &test_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test a different form of unknown external entity */

+typedef struct ext_hdlr_data {

+ const char *parse_text;

+ XML_ExternalEntityRefHandler handler;

+} ExtHdlrData;

+static int XMLCALL

+external_entity_oneshot_loader(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ ExtHdlrData *test_data = (ExtHdlrData *)XML_GetUserData(parser);

+ XML_Parser ext_parser;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser.");

+ /* Use the requested entity parser for further externals */

+ XML_SetExternalEntityRefHandler(ext_parser, test_data->handler);

+ if ( _XML_Parse_SINGLE_BYTES(ext_parser,

+ test_data->parse_text,

+ (int)strlen(test_data->parse_text),

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(ext_parser);

+ }

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_OK;

+START_TEST(test_skipped_null_loaded_ext_entity)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/one.ent'>\n"

+ "<doc />";

+ ExtHdlrData test_data = {

+ "<!ENTITY % pe1 SYSTEM 'http://example.org/two.ent'>\n"

+ "<!ENTITY % pe2 '%pe1;'>\n"

+ "%pe2;\n",

+ external_entity_null_loader

+ };

+ XML_SetUserData(parser, &test_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_oneshot_loader);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_skipped_unloaded_ext_entity)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/one.ent'>\n"

+ "<doc />";

+ ExtHdlrData test_data = {

+ "<!ENTITY % pe1 SYSTEM 'http://example.org/two.ent'>\n"

+ "<!ENTITY % pe2 '%pe1;'>\n"

+ "%pe2;\n",

+ NULL

+ };

+ XML_SetUserData(parser, &test_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_oneshot_loader);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test that a parameter entity value ending with a carriage return

+ * has it translated internally into a newline.

+ */

+START_TEST(test_param_entity_with_trailing_cr)

+#define PARAM_ENTITY_NAME "pe"

+#define PARAM_ENTITY_CORE_VALUE "<!ATTLIST doc att CDATA \"default\">"

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/'>\n"

+ "<doc/>";

+ ExtTest test_data = {

+ "<!ENTITY % " PARAM_ENTITY_NAME

+ " '" PARAM_ENTITY_CORE_VALUE "\r'>\n"

+ "%" PARAM_ENTITY_NAME ";\n",

+ NULL,

+ NULL

+ };

+ XML_SetUserData(parser, &test_data);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader);

+ XML_SetEntityDeclHandler(parser, param_entity_match_handler);

+ entity_name_to_match = XCS(PARAM_ENTITY_NAME);

+ entity_value_to_match = XCS(PARAM_ENTITY_CORE_VALUE) XCS("\n");

+ entity_match_flag = ENTITY_MATCH_NOT_FOUND;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (entity_match_flag == ENTITY_MATCH_FAIL)

+ fail("Parameter entity CR->NEWLINE conversion failed");

+ else if (entity_match_flag == ENTITY_MATCH_NOT_FOUND)

+ fail("Parameter entity not parsed");

+#undef PARAM_ENTITY_NAME

+#undef PARAM_ENTITY_CORE_VALUE

+END_TEST

+START_TEST(test_invalid_character_entity)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY entity '&#x110000;'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ expect_failure(text, XML_ERROR_BAD_CHAR_REF,

+ "Out of range character reference not faulted");

+END_TEST

+START_TEST(test_invalid_character_entity_2)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY entity '&#xg0;'>\n"

+ "]>\n"

+ "<doc>&entity;</doc>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Out of range character reference not faulted");

+END_TEST

+START_TEST(test_invalid_character_entity_3)

+ const char text[] =

+ /* <!DOCTYPE doc [\n */

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0o\0c\0 \0[\0\n"

+ /* U+0E04 = KHO KHWAI

+ * U+0E08 = CHO CHAN */

+ /* <!ENTITY entity '&\u0e04\u0e08;'>\n */

+ "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0e\0n\0t\0i\0t\0y\0 "

+ "\0'\0&\x0e\x04\x0e\x08\0;\0'\0>\0\n"

+ /* ]>\n */

+ "\0]\0>\0\n"

+ /* <doc>&entity;</doc> */

+ "\0<\0d\0o\0c\0>\0&\0e\0n\0t\0i\0t\0y\0;\0<\0/\0d\0o\0c\0>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Invalid start of entity name not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_UNDEFINED_ENTITY)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_invalid_character_entity_4)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY entity '&#1114112;'>\n" /* = &#x110000 */

+ "]>\n"

+ "<doc>&entity;</doc>";

+ expect_failure(text, XML_ERROR_BAD_CHAR_REF,

+ "Out of range character reference not faulted");

+END_TEST

+/* Test that processing instructions are picked up by a default handler */

+START_TEST(test_pi_handled_in_default)

+ const char *text = "<?test processing instruction?>\n<doc/>";

+ const XML_Char *expected = XCS("<?test processing instruction?>\n<doc/>");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE)== XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that comments are picked up by a default handler */

+START_TEST(test_comment_handled_in_default)

+ const char *text = "\n<doc/>";

+ const XML_Char *expected = XCS("\n<doc/>");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test PIs that look almost but not quite like XML declarations */

+static void XMLCALL

+accumulate_pi_characters(void *userData,

+ const XML_Char *target,

+ const XML_Char *data)

+ CharData *storage = (CharData *)userData;

+ CharData_AppendXMLChars(storage, target, -1);

+ CharData_AppendXMLChars(storage, XCS(": "), 2);

+ CharData_AppendXMLChars(storage, data, -1);

+ CharData_AppendXMLChars(storage, XCS("\n"), 1);

+START_TEST(test_pi_yml)

+ const char *text = "<?yml something like data?><doc/>";

+ const XML_Char *expected = XCS("yml: something like data\n");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_pi_xnl)

+ const char *text = "<?xnl nothing like data?><doc/>";

+ const XML_Char *expected = XCS("xnl: nothing like data\n");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_pi_xmm)

+ const char *text = "<?xmm everything like data?><doc/>";

+ const XML_Char *expected = XCS("xmm: everything like data\n");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_utf16_pi)

+ const char text[] =

+ /* <?{KHO KHWAI}{CHO CHAN}?>

+ * where {KHO KHWAI} = U+0E04

+ * and {CHO CHAN} = U+0E08

+ */

+ "<\0?\0\x04\x0e\x08\x0e?\0>\0"

+ /* <q/> */

+ "<\0q\0/\0>\0";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x0e04\x0e08: \n");

+#else

+ const XML_Char *expected = XCS("\xe0\xb8\x84\xe0\xb8\x88: \n");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_utf16_be_pi)

+ const char text[] =

+ /* <?{KHO KHWAI}{CHO CHAN}?>

+ * where {KHO KHWAI} = U+0E04

+ * and {CHO CHAN} = U+0E08

+ */

+ "\0<\0?\x0e\x04\x0e\x08\0?\0>"

+ /* <q/> */

+ "\0<\0q\0/\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x0e04\x0e08: \n");

+#else

+ const XML_Char *expected = XCS("\xe0\xb8\x84\xe0\xb8\x88: \n");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetProcessingInstructionHandler(parser, accumulate_pi_characters);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that comments can be picked up and translated */

+static void XMLCALL

+accumulate_comment(void *userData,

+ const XML_Char *data)

+ CharData *storage = (CharData *)userData;

+ CharData_AppendXMLChars(storage, data, -1);

+START_TEST(test_utf16_be_comment)

+ const char text[] =

+ /*  */

+ "\0<\0!\0-\0-\0 \0C\0o\0m\0m\0e\0n\0t\0 \0A\0 \0-\0-\0>\0\n"

+ /* <doc/> */

+ "\0<\0d\0o\0c\0/\0>";

+ const XML_Char *expected = XCS(" Comment A ");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetCommentHandler(parser, accumulate_comment);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_utf16_le_comment)

+ const char text[] =

+ /*  */

+ "<\0!\0-\0-\0 \0C\0o\0m\0m\0e\0n\0t\0 \0B\0 \0-\0-\0>\0\n\0"

+ /* <doc/> */

+ "<\0d\0o\0c\0/\0>\0";

+ const XML_Char *expected = XCS(" Comment B ");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetCommentHandler(parser, accumulate_comment);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that the unknown encoding handler with map entries that expect

+ * conversion but no conversion function is faulted

+ */

+static int XMLCALL

+failing_converter(void *UNUSED_P(data), const char *UNUSED_P(s))

+ /* Always claim to have failed */

+ return -1;

+static int XMLCALL

+prefix_converter(void *UNUSED_P(data), const char *s)

+ /* If the first byte is 0xff, raise an error */

+ if (s[0] == (char)-1)

+ return -1;

+ /* Just add the low bits of the first byte to the second */

+ return (s[1] + (s[0] & 0x7f)) & 0x01ff;

+static int XMLCALL

+MiscEncodingHandler(void *data,

+ const XML_Char *encoding,

+ XML_Encoding *info)

+ int i;

+ int high_map = -2; /* Assume a 2-byte sequence */

+ if (!xcstrcmp(encoding, XCS("invalid-9")) ||

+ !xcstrcmp(encoding, XCS("ascii-like")) ||

+ !xcstrcmp(encoding, XCS("invalid-len")) ||

+ !xcstrcmp(encoding, XCS("invalid-a")) ||

+ !xcstrcmp(encoding, XCS("invalid-surrogate")) ||

+ !xcstrcmp(encoding, XCS("invalid-high")))

+ high_map = -1;

+ for (i = 0; i < 128; ++i)

+ info->map[i] = i;

+ for (; i < 256; ++i)

+ info->map[i] = high_map;

+ /* If required, put an invalid value in the ASCII entries */

+ if (!xcstrcmp(encoding, XCS("invalid-9")))

+ info->map[9] = 5;

+ /* If required, have a top-bit set character starts a 5-byte sequence */

+ if (!xcstrcmp(encoding, XCS("invalid-len")))

+ info->map[0x81] = -5;

+ /* If required, make a top-bit set character a valid ASCII character */

+ if (!xcstrcmp(encoding, XCS("invalid-a")))

+ info->map[0x82] = 'a';

+ /* If required, give a top-bit set character a forbidden value,

+ * what would otherwise be the first of a surrogate pair.

+ */

+ if (!xcstrcmp(encoding, XCS("invalid-surrogate")))

+ info->map[0x83] = 0xd801;

+ /* If required, give a top-bit set character too high a value */

+ if (!xcstrcmp(encoding, XCS("invalid-high")))

+ info->map[0x84] = 0x010101;

+ info->data = data;

+ info->release = NULL;

+ if (!xcstrcmp(encoding, XCS("failing-conv")))

+ info->convert = failing_converter;

+ else if (!xcstrcmp(encoding, XCS("prefix-conv")))

+ info->convert = prefix_converter;

+ else

+ info->convert = NULL;

+ return XML_STATUS_OK;

+START_TEST(test_missing_encoding_conversion_fn)

+ const char *text =

+ "<?xml version='1.0' encoding='no-conv'?>\n"

+ "<doc>\x81</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ /* MiscEncodingHandler sets up an encoding with every top-bit-set

+ * character introducing a two-byte sequence. For this, it

+ * requires a convert function. The above function call doesn't

+ * pass one through, so when BadEncodingHandler actually gets

+ * called it should supply an invalid encoding.

+ */

+ expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,

+ "Encoding with missing convert() not faulted");

+END_TEST

+START_TEST(test_failing_encoding_conversion_fn)

+ const char *text =

+ "<?xml version='1.0' encoding='failing-conv'?>\n"

+ "<doc>\x81</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ /* BadEncodingHandler sets up an encoding with every top-bit-set

+ * character introducing a two-byte sequence. For this, it

+ * requires a convert function. The above function call passes

+ * one that insists all possible sequences are invalid anyway.

+ */

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Encoding with failing convert() not faulted");

+END_TEST

+/* Test unknown encoding conversions */

+START_TEST(test_unknown_encoding_success)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ /* Equivalent to <eoc>Hello, world</eoc> */

+ "<\x81\x64\x80oc>Hello, world</\x81\x64\x80oc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ run_character_check(text, XCS("Hello, world"));

+END_TEST

+/* Test bad name character in unknown encoding */

+START_TEST(test_unknown_encoding_bad_name)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<\xff\x64oc>Hello, world</\xff\x64oc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Bad name start in unknown encoding not faulted");

+END_TEST

+/* Test bad mid-name character in unknown encoding */

+START_TEST(test_unknown_encoding_bad_name_2)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<d\xffoc>Hello, world</d\xffoc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Bad name in unknown encoding not faulted");

+END_TEST

+/* Test element name that is long enough to fill the conversion buffer

+ * in an unknown encoding, finishing with an encoded character.

+ */

+START_TEST(test_unknown_encoding_long_name_1)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<abcdefghabcdefghabcdefghijkl\x80m\x80n\x80o\x80p>"

+ "Hi"

+ "</abcdefghabcdefghabcdefghijkl\x80m\x80n\x80o\x80p>";

+ const XML_Char *expected = XCS("abcdefghabcdefghabcdefghijklmnop");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ XML_SetStartElementHandler(parser, record_element_start_handler);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test element name that is long enough to fill the conversion buffer

+ * in an unknown encoding, finishing with an simple character.

+ */

+START_TEST(test_unknown_encoding_long_name_2)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<abcdefghabcdefghabcdefghijklmnop>"

+ "Hi"

+ "</abcdefghabcdefghabcdefghijklmnop>";

+ const XML_Char *expected = XCS("abcdefghabcdefghabcdefghijklmnop");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ XML_SetStartElementHandler(parser, record_element_start_handler);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_invalid_unknown_encoding)

+ const char *text =

+ "<?xml version='1.0' encoding='invalid-9'?>\n"

+ "<doc>Hello world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,

+ "Invalid unknown encoding not faulted");

+END_TEST

+START_TEST(test_unknown_ascii_encoding_ok)

+ const char *text =

+ "<?xml version='1.0' encoding='ascii-like'?>\n"

+ "<doc>Hello, world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ run_character_check(text, XCS("Hello, world"));

+END_TEST

+START_TEST(test_unknown_ascii_encoding_fail)

+ const char *text =

+ "<?xml version='1.0' encoding='ascii-like'?>\n"

+ "<doc>Hello, \x80 world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid character not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_invalid_length)

+ const char *text =

+ "<?xml version='1.0' encoding='invalid-len'?>\n"

+ "<doc>Hello, world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,

+ "Invalid unknown encoding not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_invalid_topbit)

+ const char *text =

+ "<?xml version='1.0' encoding='invalid-a'?>\n"

+ "<doc>Hello, world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,

+ "Invalid unknown encoding not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_invalid_surrogate)

+ const char *text =

+ "<?xml version='1.0' encoding='invalid-surrogate'?>\n"

+ "<doc>Hello, \x82 world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid unknown encoding not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_invalid_high)

+ const char *text =

+ "<?xml version='1.0' encoding='invalid-high'?>\n"

+ "<doc>Hello, world</doc>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_UNKNOWN_ENCODING,

+ "Invalid unknown encoding not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_invalid_attr_value)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<doc attr='\xff\x30'/>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid attribute valid not faulted");

+END_TEST

+/* Test an external entity parser set to use latin-1 detects UTF-16

+ * BOMs correctly.

+ */

+enum ee_parse_flags {

+ EE_PARSE_NONE = 0x00,

+ EE_PARSE_FULL_BUFFER = 0x01

+};

+typedef struct ExtTest2 {

+ const char *parse_text;

+ int parse_len;

+ const XML_Char *encoding;

+ CharData *storage;

+ enum ee_parse_flags flags;

+} ExtTest2;

+static int XMLCALL

+external_entity_loader2(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ ExtTest2 *test_data = (ExtTest2 *)XML_GetUserData(parser);

+ XML_Parser extparser;

+ extparser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (extparser == NULL)

+ fail("Coulr not create external entity parser");

+ if (test_data->encoding != NULL) {

+ if (!XML_SetEncoding(extparser, test_data->encoding))

+ fail("XML_SetEncoding() ignored for external entity");

+ }

+ if (test_data->flags & EE_PARSE_FULL_BUFFER) {

+ if (XML_Parse(extparser,

+ test_data->parse_text,

+ test_data->parse_len,

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(extparser);

+ }

+ else if (_XML_Parse_SINGLE_BYTES(extparser,

+ test_data->parse_text,

+ test_data->parse_len,

+ XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(extparser);

+ }

+ XML_ParserFree(extparser);

+ return XML_STATUS_OK;

+/* Test that UTF-16 BOM does not select UTF-16 given explicit encoding */

+static void XMLCALL

+ext2_accumulate_characters(void *userData, const XML_Char *s, int len)

+ ExtTest2 *test_data = (ExtTest2 *)userData;

+ accumulate_characters(test_data->storage, s, len);

+START_TEST(test_ext_entity_latin1_utf16le_bom)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ /* If UTF-16, 0xfeff is the BOM and 0x204c is black left bullet */

+ /* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,

+ * 0x4c = L and 0x20 is a space

+ */

+ "\xff\xfe\x4c\x20",

+ 4,

+ XCS("iso-8859-1"),

+ NULL,

+ EE_PARSE_NONE

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00ff\x00feL ");

+#else

+ /* In UTF-8, y-diaeresis is 0xc3 0xbf, lowercase thorn is 0xc3 0xbe */

+ const XML_Char *expected = XCS("\xc3\xbf\xc3\xbeL ");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_ext_entity_latin1_utf16be_bom)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ /* If UTF-16, 0xfeff is the BOM and 0x204c is black left bullet */

+ /* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,

+ * 0x4c = L and 0x20 is a space

+ */

+ "\xfe\xff\x20\x4c",

+ 4,

+ XCS("iso-8859-1"),

+ NULL,

+ EE_PARSE_NONE

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00fe\x00ff L");

+#else

+ /* In UTF-8, y-diaeresis is 0xc3 0xbf, lowercase thorn is 0xc3 0xbe */

+ const XML_Char *expected = XCS("\xc3\xbe\xc3\xbf L");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Parsing the full buffer rather than a byte at a time makes a

+ * difference to the encoding scanning code, so repeat the above tests

+ * without breaking them down by byte.

+ */

+START_TEST(test_ext_entity_latin1_utf16le_bom2)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ /* If UTF-16, 0xfeff is the BOM and 0x204c is black left bullet */

+ /* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,

+ * 0x4c = L and 0x20 is a space

+ */

+ "\xff\xfe\x4c\x20",

+ 4,

+ XCS("iso-8859-1"),

+ NULL,

+ EE_PARSE_FULL_BUFFER

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00ff\x00feL ");

+#else

+ /* In UTF-8, y-diaeresis is 0xc3 0xbf, lowercase thorn is 0xc3 0xbe */

+ const XML_Char *expected = XCS("\xc3\xbf\xc3\xbeL ");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_ext_entity_latin1_utf16be_bom2)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ /* If UTF-16, 0xfeff is the BOM and 0x204c is black left bullet */

+ /* If Latin-1, 0xff = Y-diaeresis, 0xfe = lowercase thorn,

+ * 0x4c = L and 0x20 is a space

+ */

+ "\xfe\xff\x20\x4c",

+ 4,

+ XCS("iso-8859-1"),

+ NULL,

+ EE_PARSE_FULL_BUFFER

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00fe\x00ff L");

+#else

+ /* In UTF-8, y-diaeresis is 0xc3 0xbf, lowercase thorn is 0xc3 0xbe */

+ const XML_Char *expected = "\xc3\xbe\xc3\xbf L";

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (XML_Parse(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test little-endian UTF-16 given an explicit big-endian encoding */

+START_TEST(test_ext_entity_utf16_be)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ "<\0e\0/\0>\0",

+ 8,

+ XCS("utf-16be"),

+ NULL,

+ EE_PARSE_NONE

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x3c00\x6500\x2f00\x3e00");

+#else

+ const XML_Char *expected =

+ XCS("\xe3\xb0\x80" /* U+3C00 */

+ "\xe6\x94\x80" /* U+6500 */

+ "\xe2\xbc\x80" /* U+2F00 */

+ "\xe3\xb8\x80"); /* U+3E00 */

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test big-endian UTF-16 given an explicit little-endian encoding */

+START_TEST(test_ext_entity_utf16_le)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ "\0<\0e\0/\0>",

+ 8,

+ XCS("utf-16le"),

+ NULL,

+ EE_PARSE_NONE

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x3c00\x6500\x2f00\x3e00");

+#else

+ const XML_Char *expected =

+ XCS("\xe3\xb0\x80" /* U+3C00 */

+ "\xe6\x94\x80" /* U+6500 */

+ "\xe2\xbc\x80" /* U+2F00 */

+ "\xe3\xb8\x80"); /* U+3E00 */

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test little-endian UTF-16 given no explicit encoding.

+ * The existing default encoding (UTF-8) is assumed to hold without a

+ * BOM to contradict it, so the entity value will in fact provoke an

+ * error because 0x00 is not a valid XML character. We parse the

+ * whole buffer in one go rather than feeding it in byte by byte to

+ * exercise different code paths in the initial scanning routines.

+ */

+typedef struct ExtFaults2 {

+ const char *parse_text;

+ int parse_len;

+ const char *fail_text;

+ const XML_Char *encoding;

+ enum XML_Error error;

+} ExtFaults2;

+static int XMLCALL

+external_entity_faulter2(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ ExtFaults2 *test_data = (ExtFaults2 *)XML_GetUserData(parser);

+ XML_Parser extparser;

+ extparser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (extparser == NULL)

+ fail("Could not create external entity parser");

+ if (test_data->encoding != NULL) {

+ if (!XML_SetEncoding(extparser, test_data->encoding))

+ fail("XML_SetEncoding() ignored for external entity");

+ }

+ if (XML_Parse(extparser,

+ test_data->parse_text,

+ test_data->parse_len,

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail(test_data->fail_text);

+ if (XML_GetErrorCode(extparser) != test_data->error)

+ xml_failure(extparser);

+ XML_ParserFree(extparser);

+ return XML_STATUS_ERROR;

+START_TEST(test_ext_entity_utf16_unknown)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtFaults2 test_data = {

+ "a\0b\0c\0",

+ 6,

+ "Invalid character in entity not faulted",

+ NULL,

+ XML_ERROR_INVALID_TOKEN

+ };

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter2);

+ XML_SetUserData(parser, &test_data);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Invalid character should not have been accepted");

+END_TEST

+/* Test not-quite-UTF-8 BOM (0xEF 0xBB 0xBF) */

+START_TEST(test_ext_entity_utf8_non_bom)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ ExtTest2 test_data = {

+ "\xef\xbb\x80", /* Arabic letter DAD medial form, U+FEC0 */

+ 3,

+ NULL,

+ EE_PARSE_NONE

+ };

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\xfec0");

+#else

+ const XML_Char *expected = XCS("\xef\xbb\x80");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that UTF-8 in a CDATA section is correctly passed through */

+START_TEST(test_utf8_in_cdata_section)

+ const char *text = "<doc><![CDATA[one \xc3\xa9 two]]></doc>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("one \x00e9 two");

+#else

+ const XML_Char *expected = XCS("one \xc3\xa9 two");

+#endif

+ run_character_check(text, expected);

+END_TEST

+/* Test that little-endian UTF-16 in a CDATA section is handled */

+START_TEST(test_utf8_in_cdata_section_2)

+ const char *text = "<doc><![CDATA[\xc3\xa9]\xc3\xa9two]]></doc>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e9]\x00e9two");

+#else

+ const XML_Char *expected = XCS("\xc3\xa9]\xc3\xa9two");

+#endif

+ run_character_check(text, expected);

+END_TEST

+/* Test trailing spaces in elements are accepted */

+static void XMLCALL

+record_element_end_handler(void *userData,

+ const XML_Char *name)

+ CharData *storage = (CharData *)userData;

+ CharData_AppendXMLChars(storage, XCS("/"), 1);

+ CharData_AppendXMLChars(storage, name, -1);

+START_TEST(test_trailing_spaces_in_elements)

+ const char *text = "<doc >Hi</doc >";

+ const XML_Char *expected = XCS("doc/doc");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetElementHandler(parser, record_element_start_handler,

+ record_element_end_handler);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_utf16_attribute)

+ const char text[] =

+ /* <d {KHO KHWAI}{CHO CHAN}='a'/>

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ * and {CHO CHAN} = U+0E08 = 0xe0 0xb8 0x88 in UTF-8

+ */

+ "<\0d\0 \0\x04\x0e\x08\x0e=\0'\0a\0'\0/\0>\0";

+ const XML_Char *expected = XCS("a");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetStartElementHandler(parser, accumulate_attribute);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_utf16_second_attr)

+ /* <d a='1' {KHO KHWAI}{CHO CHAN}='2'/>

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ * and {CHO CHAN} = U+0E08 = 0xe0 0xb8 0x88 in UTF-8

+ */

+ const char text[] =

+ "<\0d\0 \0a\0=\0'\0\x31\0'\0 \0"

+ "\x04\x0e\x08\x0e=\0'\0\x32\0'\0/\0>\0";

+ const XML_Char *expected = XCS("1");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetStartElementHandler(parser, accumulate_attribute);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_attr_after_solidus)

+ const char *text = "<doc attr1='a' / attr2='b'>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Misplaced / not faulted");

+END_TEST

+static void XMLCALL

+accumulate_entity_decl(void *userData,

+ const XML_Char *entityName,

+ int UNUSED_P(is_parameter_entity),

+ const XML_Char *value,

+ int value_length,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId),

+ const XML_Char *UNUSED_P(notationName))

+ CharData *storage = (CharData *)userData;

+ CharData_AppendXMLChars(storage, entityName, -1);

+ CharData_AppendXMLChars(storage, XCS("="), 1);

+ CharData_AppendXMLChars(storage, value, value_length);

+ CharData_AppendXMLChars(storage, XCS("\n"), 1);

+START_TEST(test_utf16_pe)

+ /* <!DOCTYPE doc [

+ * <!ENTITY % {KHO KHWAI}{CHO CHAN} '<!ELEMENT doc (#PCDATA)>'>

+ * %{KHO KHWAI}{CHO CHAN};

+ * ]>

+ * <doc></doc>

+ *

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ * and {CHO CHAN} = U+0E08 = 0xe0 0xb8 0x88 in UTF-8

+ */

+ const char text[] =

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0o\0c\0 \0[\0\n"

+ "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0%\0 \x0e\x04\x0e\x08\0 "

+ "\0'\0<\0!\0E\0L\0E\0M\0E\0N\0T\0 "

+ "\0d\0o\0c\0 \0(\0#\0P\0C\0D\0A\0T\0A\0)\0>\0'\0>\0\n"

+ "\0%\x0e\x04\x0e\x08\0;\0\n"

+ "\0]\0>\0\n"

+ "\0<\0d\0o\0c\0>\0<\0/\0d\0o\0c\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected =

+ XCS("\x0e04\x0e08=<!ELEMENT doc (#PCDATA)>\n");

+#else

+ const XML_Char *expected =

+ XCS("\xe0\xb8\x84\xe0\xb8\x88=<!ELEMENT doc (#PCDATA)>\n");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetEntityDeclHandler(parser, accumulate_entity_decl);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that duff attribute description keywords are rejected */

+START_TEST(test_bad_attr_desc_keyword)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ATTLIST doc attr CDATA #!IMPLIED>\n"

+ "]>\n"

+ "<doc />";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Bad keyword !IMPLIED not faulted");

+END_TEST

+/* Test that an invalid attribute description keyword consisting of

+ * UTF-16 characters with their top bytes non-zero are correctly

+ * faulted

+ */

+START_TEST(test_bad_attr_desc_keyword_utf16)

+ /* <!DOCTYPE d [

+ * <!ATTLIST d a CDATA #{KHO KHWAI}{CHO CHAN}>

+ * ]><d/>

+ *

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ * and {CHO CHAN} = U+0E08 = 0xe0 0xb8 0x88 in UTF-8

+ */

+ const char text[] =

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0 \0[\0\n"

+ "\0<\0!\0A\0T\0T\0L\0I\0S\0T\0 \0d\0 \0a\0 \0C\0D\0A\0T\0A\0 "

+ "\0#\x0e\x04\x0e\x08\0>\0\n"

+ "\0]\0>\0<\0d\0/\0>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Invalid UTF16 attribute keyword not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_SYNTAX)

+ xml_failure(parser);

+END_TEST

+/* Test that invalid syntax in a <!DOCTYPE> is rejected. Do this

+ * using prefix-encoding (see above) to trigger specific code paths

+ */

+START_TEST(test_bad_doctype)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<!DOCTYPE doc [ \x80\x44 ]><doc/>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "Invalid bytes in DOCTYPE not faulted");

+END_TEST

+START_TEST(test_bad_doctype_utf16)

+ const char text[] =

+ /* <!DOCTYPE doc [ \x06f2 ]><doc/>

+ *

+ * U+06F2 = EXTENDED ARABIC-INDIC DIGIT TWO, a valid number

+ * (name character) but not a valid letter (name start character)

+ */

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0o\0c\0 \0[\0 "

+ "\x06\xf2"

+ "\0 \0]\0>\0<\0d\0o\0c\0/\0>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Invalid bytes in DOCTYPE not faulted");

+ if (XML_GetErrorCode(parser) != XML_ERROR_SYNTAX)

+ xml_failure(parser);

+END_TEST

+START_TEST(test_bad_doctype_plus)

+ const char *text =

+ "<!DOCTYPE 1+ [ <!ENTITY foo 'bar'> ]>\n"

+ "<1+>&foo;</1+>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "'+' in document name not faulted");

+END_TEST

+START_TEST(test_bad_doctype_star)

+ const char *text =

+ "<!DOCTYPE 1* [ <!ENTITY foo 'bar'> ]>\n"

+ "<1*>&foo;</1*>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "'*' in document name not faulted");

+END_TEST

+START_TEST(test_bad_doctype_query)

+ const char *text =

+ "<!DOCTYPE 1? [ <!ENTITY foo 'bar'> ]>\n"

+ "<1?>&foo;</1?>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "'?' in document name not faulted");

+END_TEST

+START_TEST(test_unknown_encoding_bad_ignore)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>"

+ "<!DOCTYPE doc SYSTEM 'foo'>"

+ "<doc><e>&entity;</e></doc>";

+ ExtFaults fault = {

+ "<![IGNORE[<!ELEMENT \xffG (#PCDATA)*>]]>",

+ "Invalid character not faulted",

+ XCS("prefix-conv"),

+ XML_ERROR_INVALID_TOKEN

+ };

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_faulter);

+ XML_SetUserData(parser, &fault);

+ expect_failure(text, XML_ERROR_EXTERNAL_ENTITY_HANDLING,

+ "Bad IGNORE section with unknown encoding not failed");

+END_TEST

+START_TEST(test_entity_in_utf16_be_attr)

+ const char text[] =

+ /* <e a='ä ä'></e> */

+ "\0<\0e\0 \0a\0=\0'\0&\0#\0\x32\0\x32\0\x38\0;\0 "

+ "\0&\0#\0x\0\x30\0\x30\0E\0\x34\0;\0'\0>\0<\0/\0e\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e4 \x00e4");

+#else

+ const XML_Char *expected = XCS("\xc3\xa4 \xc3\xa4");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetStartElementHandler(parser, accumulate_attribute);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_entity_in_utf16_le_attr)

+ const char text[] =

+ /* <e a='ä ä'></e> */

+ "<\0e\0 \0a\0=\0'\0&\0#\0\x32\0\x32\0\x38\0;\0 \0"

+ "&\0#\0x\0\x30\0\x30\0E\0\x34\0;\0'\0>\0<\0/\0e\0>\0";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("\x00e4 \x00e4");

+#else

+ const XML_Char *expected = XCS("\xc3\xa4 \xc3\xa4");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetStartElementHandler(parser, accumulate_attribute);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_entity_public_utf16_be)

+ const char text[] =

+ /* <!DOCTYPE d [ */

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0 \0[\0\n"

+ /* <!ENTITY % e PUBLIC 'foo' 'bar.ent'> */

+ "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0%\0 \0e\0 \0P\0U\0B\0L\0I\0C\0 "

+ "\0'\0f\0o\0o\0'\0 \0'\0b\0a\0r\0.\0e\0n\0t\0'\0>\0\n"

+ /* %e; */

+ "\0%\0e\0;\0\n"

+ /* ]> */

+ "\0]\0>\0\n"

+ /* <d>&j;</d> */

+ "\0<\0d\0>\0&\0j\0;\0<\0/\0d\0>";

+ ExtTest2 test_data = {

+ /* <!ENTITY j 'baz'> */

+ "\0<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>",

+ 34,

+ NULL,

+ EE_PARSE_NONE

+ };

+ const XML_Char *expected = XCS("baz");

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_entity_public_utf16_le)

+ const char text[] =

+ /* <!DOCTYPE d [ */

+ "<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0d\0 \0[\0\n\0"

+ /* <!ENTITY % e PUBLIC 'foo' 'bar.ent'> */

+ "<\0!\0E\0N\0T\0I\0T\0Y\0 \0%\0 \0e\0 \0P\0U\0B\0L\0I\0C\0 \0"

+ "'\0f\0o\0o\0'\0 \0'\0b\0a\0r\0.\0e\0n\0t\0'\0>\0\n\0"

+ /* %e; */

+ "%\0e\0;\0\n\0"

+ /* ]> */

+ "]\0>\0\n\0"

+ /* <d>&j;</d> */

+ "<\0d\0>\0&\0j\0;\0<\0/\0d\0>\0";

+ ExtTest2 test_data = {

+ /* <!ENTITY j 'baz'> */

+ "<\0!\0E\0N\0T\0I\0T\0Y\0 \0j\0 \0'\0b\0a\0z\0'\0>\0",

+ 34,

+ NULL,

+ EE_PARSE_NONE

+ };

+ const XML_Char *expected = XCS("baz");

+ CharData storage;

+ CharData_Init(&storage);

+ test_data.storage = &storage;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_loader2);

+ XML_SetUserData(parser, &test_data);

+ XML_SetCharacterDataHandler(parser, ext2_accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+/* Test that a doctype with neither an internal nor external subset is

+ * faulted

+ */

+START_TEST(test_short_doctype)

+ const char *text = "<!DOCTYPE doc></doc>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "DOCTYPE without subset not rejected");

+END_TEST

+START_TEST(test_short_doctype_2)

+ const char *text = "<!DOCTYPE doc PUBLIC></doc>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "DOCTYPE without Public ID not rejected");

+END_TEST

+START_TEST(test_short_doctype_3)

+ const char *text = "<!DOCTYPE doc SYSTEM></doc>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "DOCTYPE without System ID not rejected");

+END_TEST

+START_TEST(test_long_doctype)

+ const char *text = "<!DOCTYPE doc PUBLIC 'foo' 'bar' 'baz'></doc>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "DOCTYPE with extra ID not rejected");

+END_TEST

+START_TEST(test_bad_entity)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY foo PUBLIC>\n"

+ "]>\n"

+ "<doc/>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "ENTITY without Public ID is not rejected");

+END_TEST

+/* Test unquoted value is faulted */

+START_TEST(test_bad_entity_2)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY % foo bar>\n"

+ "]>\n"

+ "<doc/>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "ENTITY without Public ID is not rejected");

+END_TEST

+START_TEST(test_bad_entity_3)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY % foo PUBLIC>\n"

+ "]>\n"

+ "<doc/>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "Parameter ENTITY without Public ID is not rejected");

+END_TEST

+START_TEST(test_bad_entity_4)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY % foo SYSTEM>\n"

+ "]>\n"

+ "<doc/>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "Parameter ENTITY without Public ID is not rejected");

+END_TEST

+START_TEST(test_bad_notation)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!NOTATION n SYSTEM>\n"

+ "]>\n"

+ "<doc/>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "Notation without System ID is not rejected");

+END_TEST

+/* Test for issue #11, wrongly suppressed default handler */

+typedef struct default_check {

+ const XML_Char *expected;

+ const int expectedLen;

+ XML_Bool seen;

+} DefaultCheck;

+static void XMLCALL

+checking_default_handler(void *userData,

+ const XML_Char *s,

+ int len)

+ DefaultCheck *data = (DefaultCheck *)userData;

+ int i;

+ for (i = 0; data[i].expected != NULL; i++) {

+ if (data[i].expectedLen == len &&

+ !memcmp(data[i].expected, s, len * sizeof(XML_Char))) {

+ data[i].seen = XML_TRUE;

+ break;

+ }

+START_TEST(test_default_doctype_handler)

+ const char *text =

+ "<!DOCTYPE doc PUBLIC 'pubname' 'test.dtd' [\n"

+ " <!ENTITY foo 'bar'>\n"

+ "]>\n"

+ "<doc>&foo;</doc>";

+ DefaultCheck test_data[] = {

+ {

+ XCS("'pubname'"),

+ 9,

+ XML_FALSE

+ },

+ {

+ XCS("'test.dtd'"),

+ 10,

+ XML_FALSE

+ },

+ { NULL, 0, XML_FALSE }

+ };

+ int i;

+ XML_SetUserData(parser, &test_data);

+ XML_SetDefaultHandler(parser, checking_default_handler);

+ XML_SetEntityDeclHandler(parser, dummy_entity_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ for (i = 0; test_data[i].expected != NULL; i++)

+ if (!test_data[i].seen)

+ fail("Default handler not run for public !DOCTYPE");

+END_TEST

+START_TEST(test_empty_element_abort)

+ const char *text = "<abort/>";

+ XML_SetStartElementHandler(parser, start_element_suspender);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Expected to error on abort");

+END_TEST

* Namespaces tests.

@@ -1252,7 +7118,7 @@ END_TEST

static void

namespace_setup(void)

{

- parser = XML_ParserCreateNS(NULL, ' ');

+ parser = XML_ParserCreateNS(NULL, XCS(' '));

if (parser == NULL)

fail("Parser not created.");

}

@@ -1268,20 +7134,25 @@ namespace_teardown(void)

provided as the userData argument; the first is the expected

element name, and the second is the expected attribute name.

+static int triplet_start_flag = XML_FALSE;

+static int triplet_end_flag = XML_FALSE;

static void XMLCALL

triplet_start_checker(void *userData, const XML_Char *name,

const XML_Char **atts)

{

- char **elemstr = (char **)userData;

+ XML_Char **elemstr = (XML_Char **)userData;

char buffer[1024];

- if (strcmp(elemstr[0], name) != 0) {

- sprintf(buffer, "unexpected start string: '%s'", name);

+ if (xcstrcmp(elemstr[0], name) != 0) {

+ sprintf(buffer, "unexpected start string: '%" XML_FMT_STR "'", name);

fail(buffer);

}

- if (strcmp(elemstr[1], atts[0]) != 0) {

- sprintf(buffer, "unexpected attribute string: '%s'", atts[0]);

+ if (xcstrcmp(elemstr[1], atts[0]) != 0) {

+ sprintf(buffer, "unexpected attribute string: '%" XML_FMT_STR "'",

+ atts[0]);

fail(buffer);

}

+ triplet_start_flag = XML_TRUE;

}

/* Check that the element name passed to the end-element handler matches

@@ -1291,28 +7162,50 @@ triplet_start_checker(void *userData, const XML_Char *name,

static void XMLCALL

triplet_end_checker(void *userData, const XML_Char *name)

{

- char **elemstr = (char **)userData;

- if (strcmp(elemstr[0], name) != 0) {

+ XML_Char **elemstr = (XML_Char **)userData;

+ if (xcstrcmp(elemstr[0], name) != 0) {

char buffer[1024];

- sprintf(buffer, "unexpected end string: '%s'", name);

+ sprintf(buffer, "unexpected end string: '%" XML_FMT_STR "'", name);

fail(buffer);

}

+ triplet_end_flag = XML_TRUE;

}

START_TEST(test_return_ns_triplet)

{

const char *text =

- "<foo:e xmlns:foo='http://expat.sf.net/' bar:a='12'\n"

- " xmlns:bar='http://expat.sf.net/'></foo:e>";

- const char *elemstr[] = {

- "http://expat.sf.net/ e foo",

- "http://expat.sf.net/ a bar"

+ "<foo:e xmlns:foo='http://example.org/' bar:a='12'\n"

+ " xmlns:bar='http://example.org/'>";

+ const char *epilog = "</foo:e>";

+ const XML_Char *elemstr[] = {

+ XCS("http://example.org/ e foo"),

+ XCS("http://example.org/ a bar")

};

XML_SetReturnNSTriplet(parser, XML_TRUE);

- XML_SetUserData(parser, elemstr);

- XML_SetElementHandler(parser, triplet_start_checker, triplet_end_checker);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ XML_SetUserData(parser, (void *)elemstr);

+ XML_SetElementHandler(parser, triplet_start_checker,

+ triplet_end_checker);

+ XML_SetNamespaceDeclHandler(parser,

+ dummy_start_namespace_decl_handler,

+ dummy_end_namespace_decl_handler);

+ triplet_start_flag = XML_FALSE;

+ triplet_end_flag = XML_FALSE;

+ dummy_handler_flags = 0;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_FALSE) == XML_STATUS_ERROR)

xml_failure(parser);

+ if (!triplet_start_flag)

+ fail("triplet_start_checker not invoked");

+ /* Check that unsetting "return triplets" fails while still parsing */

+ XML_SetReturnNSTriplet(parser, XML_FALSE);

+ if (_XML_Parse_SINGLE_BYTES(parser, epilog, (int)strlen(epilog),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (!triplet_end_flag)

+ fail("triplet_end_checker not invoked");

+ if (dummy_handler_flags != (DUMMY_START_NS_DECL_HANDLER_FLAG |

+ DUMMY_END_NS_DECL_HANDLER_FLAG))

+ fail("Namespace handlers not called");

}

END_TEST

@@ -1321,55 +7214,55 @@ overwrite_start_checker(void *userData, const XML_Char *name,

const XML_Char **atts)

{

CharData *storage = (CharData *) userData;

- CharData_AppendString(storage, "start ");

+ CharData_AppendXMLChars(storage, XCS("start "), 6);

CharData_AppendXMLChars(storage, name, -1);

while (*atts != NULL) {

- CharData_AppendString(storage, "\nattribute ");

+ CharData_AppendXMLChars(storage, XCS("\nattribute "), 11);

CharData_AppendXMLChars(storage, *atts, -1);

atts += 2;

}

- CharData_AppendString(storage, "\n");

+ CharData_AppendXMLChars(storage, XCS("\n"), 1);

}

static void XMLCALL

overwrite_end_checker(void *userData, const XML_Char *name)

{

CharData *storage = (CharData *) userData;

- CharData_AppendString(storage, "end ");

+ CharData_AppendXMLChars(storage, XCS("end "), 4);

CharData_AppendXMLChars(storage, name, -1);

- CharData_AppendString(storage, "\n");

+ CharData_AppendXMLChars(storage, XCS("\n"), 1);

}

static void

-run_ns_tagname_overwrite_test(const char *text, const char *result)

+run_ns_tagname_overwrite_test(const char *text, const XML_Char *result)

{

CharData storage;

CharData_Init(&storage);

XML_SetUserData(parser, &storage);

XML_SetElementHandler(parser,

overwrite_start_checker, overwrite_end_checker);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

- CharData_CheckString(&storage, result);

+ CharData_CheckXMLChars(&storage, result);

}

/* Regression test for SF bug #566334. */

START_TEST(test_ns_tagname_overwrite)

{

const char *text =

- "<n:e xmlns:n='http://xml.libexpat.org/'>\n"

+ "<n:e xmlns:n='http://example.org/'>\n"

" <n:f n:attr='foo'/>\n"

" <n:g n:attr2='bar'/>\n"

"</n:e>";

- const char *result =

- "start http://xml.libexpat.org/ e\n"

- "start http://xml.libexpat.org/ f\n"

- "attribute http://xml.libexpat.org/ attr\n"

- "end http://xml.libexpat.org/ f\n"

- "start http://xml.libexpat.org/ g\n"

- "attribute http://xml.libexpat.org/ attr2\n"

- "end http://xml.libexpat.org/ g\n"

- "end http://xml.libexpat.org/ e\n";

+ const XML_Char *result =

+ XCS("start http://example.org/ e\n")

+ XCS("start http://example.org/ f\n")

+ XCS("attribute http://example.org/ attr\n")

+ XCS("end http://example.org/ f\n")

+ XCS("start http://example.org/ g\n")

+ XCS("attribute http://example.org/ attr2\n")

+ XCS("end http://example.org/ g\n")

+ XCS("end http://example.org/ e\n");

run_ns_tagname_overwrite_test(text, result);

}

END_TEST

@@ -1378,19 +7271,19 @@ END_TEST

START_TEST(test_ns_tagname_overwrite_triplet)

{

const char *text =

- "<n:e xmlns:n='http://xml.libexpat.org/'>\n"

+ "<n:e xmlns:n='http://example.org/'>\n"

" <n:f n:attr='foo'/>\n"

" <n:g n:attr2='bar'/>\n"

"</n:e>";

- const char *result =

- "start http://xml.libexpat.org/ e n\n"

- "start http://xml.libexpat.org/ f n\n"

- "attribute http://xml.libexpat.org/ attr n\n"

- "end http://xml.libexpat.org/ f n\n"

- "start http://xml.libexpat.org/ g n\n"

- "attribute http://xml.libexpat.org/ attr2 n\n"

- "end http://xml.libexpat.org/ g n\n"

- "end http://xml.libexpat.org/ e n\n";

+ const XML_Char *result =

+ XCS("start http://example.org/ e n\n")

+ XCS("start http://example.org/ f n\n")

+ XCS("attribute http://example.org/ attr n\n")

+ XCS("end http://example.org/ f n\n")

+ XCS("start http://example.org/ g n\n")

+ XCS("attribute http://example.org/ attr2 n\n")

+ XCS("end http://example.org/ g n\n")

+ XCS("end http://example.org/ e n\n");

XML_SetReturnNSTriplet(parser, XML_TRUE);

run_ns_tagname_overwrite_test(text, result);

}

@@ -1420,12 +7313,13 @@ START_TEST(test_start_ns_clears_start_element)

syntax doesn't cause the problematic path through Expat to be

taken.

- const char *text = "<e xmlns='http://xml.libexpat.org/'></e>";

+ const char *text = "<e xmlns='http://example.org/'></e>";

XML_SetStartElementHandler(parser, start_element_fail);

XML_SetStartNamespaceDeclHandler(parser, start_ns_clearing_start_element);

+ XML_SetEndNamespaceDeclHandler(parser, dummy_end_namespace_decl_handler);

XML_UseParserAsHandlerArg(parser);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -1452,22 +7346,22 @@ external_entity_handler(XML_Parser parser,

XML_SetUserData(parser, (void *) callno);

p2 = XML_ExternalEntityParserCreate(parser, context, NULL);

- if (_XML_Parse_SINGLE_BYTES(p2, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR) {

+ if (_XML_Parse_SINGLE_BYTES(p2, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR) {

xml_failure(p2);

- return 0;

+ return XML_STATUS_ERROR;

}

XML_ParserFree(p2);

- return 1;

+ return XML_STATUS_OK;

}

START_TEST(test_default_ns_from_ext_subset_and_ext_ge)

{

const char *text =

"<?xml version='1.0'?>\n"

- "<!DOCTYPE doc SYSTEM 'http://xml.libexpat.org/doc.dtd' [\n"

- " <!ENTITY en SYSTEM 'http://xml.libexpat.org/entity.ent'>\n"

+ "<!DOCTYPE doc SYSTEM 'http://example.org/doc.dtd' [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/entity.ent'>\n"

"]>\n"

- "<doc xmlns='http://xml.libexpat.org/ns1'>\n"

+ "<doc xmlns='http://example.org/ns1'>\n"

"&en;\n"

"</doc>";

@@ -1476,7 +7370,7 @@ START_TEST(test_default_ns_from_ext_subset_and_ext_ge)

/* We actually need to set this handler to tickle this bug. */

XML_SetStartElementHandler(parser, dummy_start_element);

XML_SetUserData(parser, NULL);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -1485,7 +7379,7 @@ END_TEST

START_TEST(test_ns_prefix_with_empty_uri_1)

{

const char *text =

- "<doc xmlns:prefix='http://xml.libexpat.org/'>\n"

+ "<doc xmlns:prefix='http://example.org/'>\n"

" <e xmlns:prefix=''/>\n"

"</doc>";

@@ -1533,19 +7427,38 @@ START_TEST(test_ns_prefix_with_empty_uri_4)

"<!DOCTYPE doc [\n"

" <!ELEMENT prefix:doc EMPTY>\n"

" <!ATTLIST prefix:doc\n"

- " xmlns:prefix CDATA 'http://xml.libexpat.org/'>\n"

+ " xmlns:prefix CDATA 'http://example.org/'>\n"

"]>\n"

"<prefix:doc/>";

/* Packaged info expected by the end element handler;

the weird structuring lets us re-use the triplet_end_checker()

function also used for another test. */

- const char *elemstr[] = {

- "http://xml.libexpat.org/ doc prefix"

+ const XML_Char *elemstr[] = {

+ XCS("http://example.org/ doc prefix")

};

XML_SetReturnNSTriplet(parser, XML_TRUE);

- XML_SetUserData(parser, elemstr);

+ XML_SetUserData(parser, (void *)elemstr);

XML_SetEndElementHandler(parser, triplet_end_checker);

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test with non-xmlns prefix */

+START_TEST(test_ns_unbound_prefix)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ELEMENT prefix:doc EMPTY>\n"

+ " <!ATTLIST prefix:doc\n"

+ " notxmlns:prefix CDATA 'http://example.org/'>\n"

+ "]>\n"

+ "<prefix:doc/>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ fail("Unbound prefix incorrectly passed");

+ if (XML_GetErrorCode(parser) != XML_ERROR_UNBOUND_PREFIX)

xml_failure(parser);

}

END_TEST

@@ -1553,10 +7466,15 @@ END_TEST

START_TEST(test_ns_default_with_empty_uri)

{

const char *text =

- "<doc xmlns='http://xml.libexpat.org/'>\n"

+ "<doc xmlns='http://example.org/'>\n"

" <e xmlns=''/>\n"

"</doc>";

- if (_XML_Parse_SINGLE_BYTES(parser, text, strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ /* Add some handlers to exercise extra code paths */

+ XML_SetStartNamespaceDeclHandler(parser,

+ dummy_start_namespace_decl_handler);

+ XML_SetEndNamespaceDeclHandler(parser,

+ dummy_end_namespace_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

xml_failure(parser);

}

END_TEST

@@ -1565,8 +7483,8 @@ END_TEST

START_TEST(test_ns_duplicate_attrs_diff_prefixes)

{

const char *text =

- "<doc xmlns:a='http://xml.libexpat.org/a'\n"

- " xmlns:b='http://xml.libexpat.org/a'\n"

+ "<doc xmlns:a='http://example.org/a'\n"

+ " xmlns:b='http://example.org/a'\n"

" a:a='v' b:a='v' />";

expect_failure(text,

XML_ERROR_DUPLICATE_ATTRIBUTE,

@@ -1574,6 +7492,33 @@ START_TEST(test_ns_duplicate_attrs_diff_prefixes)

}

END_TEST

+START_TEST(test_ns_duplicate_hashes)

+ /* The hash of an attribute is calculated as the hash of its URI

+ * concatenated with a space followed by its name (after the

+ * colon). We wish to generate attributes with the same hash

+ * value modulo the attribute table size so that we can check that

+ * the attribute hash table works correctly. The attribute hash

+ * table size will be the smallest power of two greater than the

+ * number of attributes, but at least eight. There is

+ * unfortunately no programmatic way of getting the hash or the

+ * table size at user level, but the test code coverage percentage

+ * will drop if the hashes cease to point to the same row.

+ *

+ * The cunning plan is to have few enough attributes to have a

+ * reliable table size of 8, and have the single letter attribute

+ * names be 8 characters apart, producing a hash which will be the

+ * same modulo 8.

+ */

+ const char *text =

+ "<doc xmlns:a='http://example.org/a'\n"

+ " a:a='v' a:i='w' />";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

/* Regression test for SF bug #695401: unbound prefix. */

START_TEST(test_ns_unbound_prefix_on_attribute)

{

@@ -1594,25 +7539,4472 @@ START_TEST(test_ns_unbound_prefix_on_element)

}

END_TEST

+/* Test that the parsing status is correctly reset by XML_ParserReset().

+ * We usE test_return_ns_triplet() for our example parse to improve

+ * coverage of tidying up code executed.

+ */

+START_TEST(test_ns_parser_reset)

+ XML_ParsingStatus status;

+ XML_GetParsingStatus(parser, &status);

+ if (status.parsing != XML_INITIALIZED)

+ fail("parsing status doesn't start INITIALIZED");

+ test_return_ns_triplet();

+ XML_GetParsingStatus(parser, &status);

+ if (status.parsing != XML_FINISHED)

+ fail("parsing status doesn't end FINISHED");

+ XML_ParserReset(parser, NULL);

+ XML_GetParsingStatus(parser, &status);

+ if (status.parsing != XML_INITIALIZED)

+ fail("parsing status doesn't reset to INITIALIZED");

+END_TEST

+/* Test that long element names with namespaces are handled correctly */

+START_TEST(test_ns_long_element)

+ const char *text =

+ "<foo:thisisalongenoughelementnametotriggerareallocation\n"

+ " xmlns:foo='http://example.org/' bar:a='12'\n"

+ " xmlns:bar='http://example.org/'>"

+ "</foo:thisisalongenoughelementnametotriggerareallocation>";

+ const XML_Char *elemstr[] = {

+ XCS("http://example.org/")

+ XCS(" thisisalongenoughelementnametotriggerareallocation foo"),

+ XCS("http://example.org/ a bar")

+ };

+ XML_SetReturnNSTriplet(parser, XML_TRUE);

+ XML_SetUserData(parser, (void *)elemstr);

+ XML_SetElementHandler(parser,

+ triplet_start_checker,

+ triplet_end_checker);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test mixed population of prefixed and unprefixed attributes */

+START_TEST(test_ns_mixed_prefix_atts)

+ const char *text =

+ "<e a='12' bar:b='13'\n"

+ " xmlns:bar='http://example.org/'>"

+ "</e>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test having a long namespaced element name inside a short one.

+ * This exercises some internal buffer reallocation that is shared

+ * across elements with the same namespace URI.

+ */

+START_TEST(test_ns_extend_uri_buffer)

+ const char *text =

+ "<foo:e xmlns:foo='http://example.org/'>"

+ " <foo:thisisalongenoughnametotriggerallocationaction"

+ " foo:a='12' />"

+ "</foo:e>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test that xmlns is correctly rejected as an attribute in the xmlns

+ * namespace, but not in other namespaces

+ */

+START_TEST(test_ns_reserved_attributes)

+ const char *text1 =

+ "<foo:e xmlns:foo='http://example.org/' xmlns:xmlns='12' />";

+ const char *text2 =

+ "<foo:e xmlns:foo='http://example.org/' foo:xmlns='12' />";

+ expect_failure(text1, XML_ERROR_RESERVED_PREFIX_XMLNS,

+ "xmlns not rejected as an attribute");

+ XML_ParserReset(parser, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test more reserved attributes */

+START_TEST(test_ns_reserved_attributes_2)

+ const char *text1 =

+ "<foo:e xmlns:foo='http://example.org/'"

+ " xmlns:xml='http://example.org/' />";

+ const char *text2 =

+ "<foo:e xmlns:foo='http://www.w3.org/XML/1998/namespace' />";

+ const char *text3 =

+ "<foo:e xmlns:foo='http://www.w3.org/2000/xmlns/' />";

+ expect_failure(text1, XML_ERROR_RESERVED_PREFIX_XML,

+ "xml not rejected as an attribute");

+ XML_ParserReset(parser, NULL);

+ expect_failure(text2, XML_ERROR_RESERVED_NAMESPACE_URI,

+ "Use of w3.org URL not faulted");

+ XML_ParserReset(parser, NULL);

+ expect_failure(text3, XML_ERROR_RESERVED_NAMESPACE_URI,

+ "Use of w3.org xmlns URL not faulted");

+END_TEST

+/* Test string pool handling of namespace names of 2048 characters */

+/* Exercises a particular string pool growth path */

+START_TEST(test_ns_extremely_long_prefix)

+ /* C99 compilers are only required to support 4095-character

+ * strings, so the following needs to be split in two to be safe

+ * for all compilers.

+ */

+ const char *text1 =

+ "<doc "

+ /* 64 character on each line */

+ /* ...gives a total length of 2048 */

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ ":a='12'";

+ const char *text2 =

+ " xmlns:"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "='foo'\n>"

+ "</doc>";

+ if (_XML_Parse_SINGLE_BYTES(parser, text1, (int)strlen(text1),

+ XML_FALSE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ if (_XML_Parse_SINGLE_BYTES(parser, text2, (int)strlen(text2),

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+/* Test unknown encoding handlers in namespace setup */

+START_TEST(test_ns_unknown_encoding_success)

+ const char *text =

+ "<?xml version='1.0' encoding='prefix-conv'?>\n"

+ "<foo:e xmlns:foo='http://example.org/'>Hi</foo:e>";

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ run_character_check(text, XCS("Hi"));

+END_TEST

+/* Test that too many colons are rejected */

+START_TEST(test_ns_double_colon)

+ const char *text =

+ "<foo:e xmlns:foo='http://example.org/' foo:a:b='bar' />";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Double colon in attribute name not faulted");

+END_TEST

+START_TEST(test_ns_double_colon_element)

+ const char *text =

+ "<foo:bar:e xmlns:foo='http://example.org/' />";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Double colon in element name not faulted");

+END_TEST

+/* Test that non-name characters after a colon are rejected */

+START_TEST(test_ns_bad_attr_leafname)

+ const char *text =

+ "<foo:e xmlns:foo='http://example.org/' foo:?ar='baz' />";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid character in leafname not faulted");

+END_TEST

+START_TEST(test_ns_bad_element_leafname)

+ const char *text =

+ "<foo:?oc xmlns:foo='http://example.org/' />";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid character in element leafname not faulted");

+END_TEST

+/* Test high-byte-set UTF-16 characters are valid in a leafname */

+START_TEST(test_ns_utf16_leafname)

+ const char text[] =

+ /* <n:e xmlns:n='URI' n:{KHO KHWAI}='a' />

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ */

+ "<\0n\0:\0e\0 \0x\0m\0l\0n\0s\0:\0n\0=\0'\0U\0R\0I\0'\0 \0"

+ "n\0:\0\x04\x0e=\0'\0a\0'\0 \0/\0>\0";

+ const XML_Char *expected = XCS("a");

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetStartElementHandler(parser, accumulate_attribute);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_ns_utf16_element_leafname)

+ const char text[] =

+ /* <n:{KHO KHWAI} xmlns:n='URI'/>

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ */

+ "\0<\0n\0:\x0e\x04\0 \0x\0m\0l\0n\0s\0:\0n\0=\0'\0U\0R\0I\0'\0/\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("URI \x0e04");

+#else

+ const XML_Char *expected = XCS("URI \xe0\xb8\x84");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetStartElementHandler(parser, start_element_event_handler);

+ XML_SetUserData(parser, &storage);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_ns_utf16_doctype)

+ const char text[] =

+ /* <!DOCTYPE foo:{KHO KHWAI} [ <!ENTITY bar 'baz'> ]>\n

+ * where {KHO KHWAI} = U+0E04 = 0xe0 0xb8 0x84 in UTF-8

+ */

+ "\0<\0!\0D\0O\0C\0T\0Y\0P\0E\0 \0f\0o\0o\0:\x0e\x04\0 "

+ "\0[\0 \0<\0!\0E\0N\0T\0I\0T\0Y\0 \0b\0a\0r\0 \0'\0b\0a\0z\0'\0>\0 "

+ "\0]\0>\0\n"

+ /* <foo:{KHO KHWAI} xmlns:foo='URI'>&bar;</foo:{KHO KHWAI}> */

+ "\0<\0f\0o\0o\0:\x0e\x04\0 "

+ "\0x\0m\0l\0n\0s\0:\0f\0o\0o\0=\0'\0U\0R\0I\0'\0>"

+ "\0&\0b\0a\0r\0;"

+ "\0<\0/\0f\0o\0o\0:\x0e\x04\0>";

+#ifdef XML_UNICODE

+ const XML_Char *expected = XCS("URI \x0e04");

+#else

+ const XML_Char *expected = XCS("URI \xe0\xb8\x84");

+#endif

+ CharData storage;

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetStartElementHandler(parser, start_element_event_handler);

+ XML_SetUnknownEncodingHandler(parser, MiscEncodingHandler, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+START_TEST(test_ns_invalid_doctype)

+ const char *text =

+ "<!DOCTYPE foo:!bad [ <!ENTITY bar 'baz' ]>\n"

+ "<foo:!bad>&bar;</foo:!bad>";

+ expect_failure(text, XML_ERROR_INVALID_TOKEN,

+ "Invalid character in document local name not faulted");

+END_TEST

+START_TEST(test_ns_double_colon_doctype)

+ const char *text =

+ "<!DOCTYPE foo:a:doc [ <!ENTITY bar 'baz' ]>\n"

+ "<foo:a:doc>&bar;</foo:a:doc>";

+ expect_failure(text, XML_ERROR_SYNTAX,

+ "Double colon in document name not faulted");

+END_TEST

+/* Control variable; the number of times duff_allocator() will successfully allocate */

+#define ALLOC_ALWAYS_SUCCEED (-1)

+#define REALLOC_ALWAYS_SUCCEED (-1)

+static intptr_t allocation_count = ALLOC_ALWAYS_SUCCEED;

+static intptr_t reallocation_count = REALLOC_ALWAYS_SUCCEED;

+/* Crocked allocator for allocation failure tests */

+static void *duff_allocator(size_t size)

+ if (allocation_count == 0)

+ return NULL;

+ if (allocation_count != ALLOC_ALWAYS_SUCCEED)

+ allocation_count--;

+ return malloc(size);

+/* Crocked reallocator for allocation failure tests */

+static void *duff_reallocator(void *ptr, size_t size)

+ if (reallocation_count == 0)

+ return NULL;

+ if (reallocation_count != REALLOC_ALWAYS_SUCCEED)

+ reallocation_count--;

+ return realloc(ptr, size);

+/* Test that a failure to allocate the parser structure fails gracefully */

+START_TEST(test_misc_alloc_create_parser)

+ XML_Memory_Handling_Suite memsuite = { duff_allocator, realloc, free };

+ unsigned int i;

+ const unsigned int max_alloc_count = 10;

+ /* Something this simple shouldn't need more than 10 allocations */

+ for (i = 0; i < max_alloc_count; i++)

+ {

+ allocation_count = i;

+ parser = XML_ParserCreate_MM(NULL, &memsuite, NULL);

+ if (parser != NULL)

+ break;

+ }

+ if (i == 0)

+ fail("Parser unexpectedly ignored failing allocator");

+ else if (i == max_alloc_count)

+ fail("Parser not created with max allocation count");

+END_TEST

+/* Test memory allocation failures for a parser with an encoding */

+START_TEST(test_misc_alloc_create_parser_with_encoding)

+ XML_Memory_Handling_Suite memsuite = { duff_allocator, realloc, free };

+ unsigned int i;

+ const unsigned int max_alloc_count = 10;

+ /* Try several levels of allocation */

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ parser = XML_ParserCreate_MM(XCS("us-ascii"), &memsuite, NULL);

+ if (parser != NULL)

+ break;

+ }

+ if (i == 0)

+ fail("Parser ignored failing allocator");

+ else if (i == max_alloc_count)

+ fail("Parser not created with max allocation count");

+END_TEST

+/* Test that freeing a NULL parser doesn't cause an explosion.

+ * (Not actually tested anywhere else)

+ */

+START_TEST(test_misc_null_parser)

+ XML_ParserFree(NULL);

+END_TEST

+/* Test that XML_ErrorString rejects out-of-range codes */

+START_TEST(test_misc_error_string)

+ if (XML_ErrorString((enum XML_Error)-1) != NULL)

+ fail("Negative error code not rejected");

+ if (XML_ErrorString((enum XML_Error)100) != NULL)

+ fail("Large error code not rejected");

+END_TEST

+/* Test the version information is consistent */

+/* Since we are working in XML_LChars (potentially 16-bits), we

+ * can't use the standard C library functions for character

+ * manipulation and have to roll our own.

+ */

+static int

+parse_version(const XML_LChar *version_text,

+ XML_Expat_Version *version_struct)

+ while (*version_text != 0x00) {

+ if (*version_text >= ASCII_0 && *version_text <= ASCII_9)

+ break;

+ version_text++;

+ }

+ if (*version_text == 0x00)

+ return XML_FALSE;

+ /* version_struct->major = strtoul(version_text, 10, &version_text) */

+ version_struct->major = 0;

+ while (*version_text >= ASCII_0 && *version_text <= ASCII_9) {

+ version_struct->major =

+ 10 * version_struct->major + (*version_text++ - ASCII_0);

+ }

+ if (*version_text++ != ASCII_PERIOD)

+ return XML_FALSE;

+ /* Now for the minor version number */

+ version_struct->minor = 0;

+ while (*version_text >= ASCII_0 && *version_text <= ASCII_9) {

+ version_struct->minor =

+ 10 * version_struct->minor + (*version_text++ - ASCII_0);

+ }

+ if (*version_text++ != ASCII_PERIOD)

+ return XML_FALSE;

+ /* Finally the micro version number */

+ version_struct->micro = 0;

+ while (*version_text >= ASCII_0 && *version_text <= ASCII_9) {

+ version_struct->micro =

+ 10 * version_struct->micro + (*version_text++ - ASCII_0);

+ }

+ if (*version_text != 0x00)

+ return XML_FALSE;

+ return XML_TRUE;

+static int

+versions_equal(const XML_Expat_Version *first,

+ const XML_Expat_Version *second)

+ return (first->major == second->major &&

+ first->minor == second->minor &&

+ first->micro == second->micro);

+START_TEST(test_misc_version)

+ XML_Expat_Version read_version = XML_ExpatVersionInfo();

+ /* Silence compiler warning with the following assignment */

+ XML_Expat_Version parsed_version = { 0, 0, 0 };

+ const XML_LChar *version_text = XML_ExpatVersion();

+ if (version_text == NULL)

+ fail("Could not obtain version text");

+ if (!parse_version(version_text, &parsed_version))

+ fail("Unable to parse version text");

+ if (!versions_equal(&read_version, &parsed_version))

+ fail("Version mismatch");

+#if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T)

+ if (xcstrcmp(version_text, XCS("expat_2.2.6"))) /* needs bump on releases */

+ fail("XML_*_VERSION in expat.h out of sync?\n");

+#else

+ /* If we have XML_UNICODE defined but not XML_UNICODE_WCHAR_T

+ * then XML_LChar is defined as char, for some reason.

+ */

+ if (strcmp(version_text, "expat_2.2.5")) /* needs bump on releases */

+ fail("XML_*_VERSION in expat.h out of sync?\n");

+#endif /* ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) */

+END_TEST

+/* Test feature information */

+START_TEST(test_misc_features)

+ const XML_Feature *features = XML_GetFeatureList();

+ /* Prevent problems with double-freeing parsers */

+ parser = NULL;

+ if (features == NULL)

+ fail("Failed to get feature information");

+ /* Loop through the features checking what we can */

+ while (features->feature != XML_FEATURE_END) {

+ switch(features->feature) {

+ case XML_FEATURE_SIZEOF_XML_CHAR:

+ if (features->value != sizeof(XML_Char))

+ fail("Incorrect size of XML_Char");

+ break;

+ case XML_FEATURE_SIZEOF_XML_LCHAR:

+ if (features->value != sizeof(XML_LChar))

+ fail("Incorrect size of XML_LChar");

+ break;

+ default:

+ break;

+ }

+ features++;

+ }

+END_TEST

+/* Regression test for GitHub Issue #17: memory leak parsing attribute

+ * values with mixed bound and unbound namespaces.

+ */

+START_TEST(test_misc_attribute_leak)

+ const char *text = "<D xmlns:L=\"D\" l:a='' L:a=''/>";

+ XML_Memory_Handling_Suite memsuite = {

+ tracking_malloc,

+ tracking_realloc,

+ tracking_free

+ };

+ parser = XML_ParserCreate_MM(XCS("UTF-8"), &memsuite, XCS("\n"));

+ expect_failure(text, XML_ERROR_UNBOUND_PREFIX,

+ "Unbound prefixes not found");

+ XML_ParserFree(parser);

+ /* Prevent the teardown trying to double free */

+ parser = NULL;

+ if (!tracking_report())

+ fail("Memory leak found");

+END_TEST

+/* Test parser created for UTF-16LE is successful */

+START_TEST(test_misc_utf16le)

+ const char text[] =

+ /* <?xml version='1.0'?><q>Hi</q> */

+ "<\0?\0x\0m\0l\0 \0"

+ "v\0e\0r\0s\0i\0o\0n\0=\0'\0\x31\0.\0\x30\0'\0?\0>\0"

+ "<\0q\0>\0H\0i\0<\0/\0q\0>\0";

+ const XML_Char *expected = XCS("Hi");

+ CharData storage;

+ parser = XML_ParserCreate(XCS("UTF-16LE"));

+ if (parser == NULL)

+ fail("Parser not created");

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)sizeof(text)-1,

+ XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+ CharData_CheckXMLChars(&storage, expected);

+END_TEST

+static void

+alloc_setup(void)

+ XML_Memory_Handling_Suite memsuite = {

+ duff_allocator,

+ duff_reallocator,

+ free

+ };

+ /* Ensure the parser creation will go through */

+ allocation_count = ALLOC_ALWAYS_SUCCEED;

+ reallocation_count = REALLOC_ALWAYS_SUCCEED;

+ parser = XML_ParserCreate_MM(NULL, &memsuite, NULL);

+ if (parser == NULL)

+ fail("Parser not created");

+static void

+alloc_teardown(void)

+ basic_teardown();

+/* Test the effects of allocation failures on xml declaration processing */

+START_TEST(test_alloc_parse_xdecl)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<doc>Hello, world</doc>";

+ int i;

+ const int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetXmlDeclHandler(parser, dummy_xdecl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* Resetting the parser is insufficient, because some memory

+ * allocations are cached within the parser. Instead we use

+ * the teardown and setup routines to ensure that we have the

+ * right sort of parser back in our hands.

+ */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+/* As above, but with an encoding big enough to cause storing the

+ * version information to expand the string pool being used.

+ */

+static int XMLCALL

+long_encoding_handler(void *UNUSED_P(userData),

+ const XML_Char *UNUSED_P(encoding),

+ XML_Encoding *info)

+ int i;

+ for (i = 0; i < 256; i++)

+ info->map[i] = i;

+ info->data = NULL;

+ info->convert = NULL;

+ info->release = NULL;

+ return XML_STATUS_OK;

+START_TEST(test_alloc_parse_xdecl_2)

+ const char *text =

+ "<?xml version='1.0' encoding='"

+ /* Each line is 64 characters */

+ "ThisIsAStupidlyLongEncodingNameIntendedToTriggerPoolGrowth123456"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMN"

+ "'?>"

+ "<doc>Hello, world</doc>";

+ int i;

+ const int max_alloc_count = 20;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetXmlDeclHandler(parser, dummy_xdecl_handler);

+ XML_SetUnknownEncodingHandler(parser, long_encoding_handler, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+/* Test the effects of allocation failures on a straightforward parse */

+START_TEST(test_alloc_parse_pi)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<?pi unknown?>\n"

+ "<doc>"

+ "Hello, world"

+ "</doc>";

+ int i;

+ const int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+START_TEST(test_alloc_parse_pi_2)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<doc>"

+ "Hello, world"

+ "<?pi unknown?>\n"

+ "</doc>";

+ int i;

+ const int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+START_TEST(test_alloc_parse_pi_3)

+ const char *text =

+ "<?"

+ /* 64 characters per line */

+ "This processing instruction should be long enough to ensure that"

+ "it triggers the growth of an internal string pool when the "

+ "allocator fails at a cruicial moment FGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "Q?><doc/>";

+ int i;

+ const int max_alloc_count = 20;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+START_TEST(test_alloc_parse_comment)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ ""

+ "<doc>Hi</doc>";

+ int i;

+ const int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetCommentHandler(parser, dummy_comment_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+START_TEST(test_alloc_parse_comment_2)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<doc>"

+ "Hello, world"

+ ""

+ "</doc>";

+ int i;

+ const int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetCommentHandler(parser, dummy_comment_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed with max allocations");

+END_TEST

+static int XMLCALL

+external_entity_duff_loader(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ XML_Parser new_parser;

+ unsigned int i;

+ const unsigned int max_alloc_count = 10;

+ /* Try a few different allocation levels */

+ for (i = 0; i < max_alloc_count; i++)

+ {

+ allocation_count = i;

+ new_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (new_parser != NULL)

+ {

+ XML_ParserFree(new_parser);

+ break;

+ }

+ if (i == 0)

+ fail("External parser creation ignored failing allocator");

+ else if (i == max_alloc_count)

+ fail("Extern parser not created with max allocation count");

+ /* Make sure other random allocation doesn't now fail */

+ allocation_count = ALLOC_ALWAYS_SUCCEED;

+ /* Make sure the failure code path is executed too */

+ return XML_STATUS_ERROR;

+/* Test that external parser creation running out of memory is

+ * correctly reported. Based on the external entity test cases.

+ */

+START_TEST(test_alloc_create_external_parser)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ char foo_text[] =

+ "<!ELEMENT doc (#PCDATA)*>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, foo_text);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_duff_loader);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR) {

+ fail("External parser allocator returned success incorrectly");

+ }

+END_TEST

+/* More external parser memory allocation testing */

+START_TEST(test_alloc_run_external_parser)

+ const char *text =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<!DOCTYPE doc SYSTEM 'foo'>\n"

+ "<doc>&entity;</doc>";

+ char foo_text[] =

+ "<!ELEMENT doc (#PCDATA)*>";

+ unsigned int i;

+ const unsigned int max_alloc_count = 15;

+ for (i = 0; i < max_alloc_count; i++) {

+ XML_SetParamEntityParsing(parser,

+ XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, foo_text);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_null_loader);

+ allocation_count = i;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parsing ignored failing allocator");

+ else if (i == max_alloc_count)

+ fail("Parsing failed with allocation count 10");

+END_TEST

+static int XMLCALL

+external_entity_dbl_handler(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ intptr_t callno = (intptr_t)XML_GetUserData(parser);

+ const char *text;

+ XML_Parser new_parser;

+ int i;

+ const int max_alloc_count = 20;

+ if (callno == 0) {

+ /* First time through, check how many calls to malloc occur */

+ text = ("<!ELEMENT doc (e+)>\n"

+ "<!ATTLIST doc xmlns CDATA #IMPLIED>\n"

+ "<!ELEMENT e EMPTY>\n");

+ allocation_count = 10000;

+ new_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (new_parser == NULL) {

+ fail("Unable to allocate first external parser");

+ return XML_STATUS_ERROR;

+ }

+ /* Stash the number of calls in the user data */

+ XML_SetUserData(parser, (void *)(intptr_t)(10000 - allocation_count));

+ } else {

+ text = ("<?xml version='1.0' encoding='us-ascii'?>"

+ "<e/>");

+ /* Try at varying levels to exercise more code paths */

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = callno + i;

+ new_parser = XML_ExternalEntityParserCreate(parser,

+ context,

+ NULL);

+ if (new_parser != NULL)

+ break;

+ }

+ if (i == 0) {

+ fail("Second external parser unexpectedly created");

+ XML_ParserFree(new_parser);

+ return XML_STATUS_ERROR;

+ }

+ else if (i == max_alloc_count) {

+ fail("Second external parser not created");

+ return XML_STATUS_ERROR;

+ }

+ allocation_count = ALLOC_ALWAYS_SUCCEED;

+ if (_XML_Parse_SINGLE_BYTES(new_parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR) {

+ xml_failure(new_parser);

+ return XML_STATUS_ERROR;

+ }

+ XML_ParserFree(new_parser);

+ return XML_STATUS_OK;

+/* Test that running out of memory in dtdCopy is correctly reported.

+ * Based on test_default_ns_from_ext_subset_and_ext_ge()

+ */

+START_TEST(test_alloc_dtd_copy_default_atts)

+ const char *text =

+ "<?xml version='1.0'?>\n"

+ "<!DOCTYPE doc SYSTEM 'http://example.org/doc.dtd' [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/entity.ent'>\n"

+ "]>\n"

+ "<doc xmlns='http://example.org/ns1'>\n"

+ "&en;\n"

+ "</doc>";

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_dbl_handler);

+ XML_SetUserData(parser, NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) == XML_STATUS_ERROR)

+ xml_failure(parser);

+END_TEST

+static int XMLCALL

+external_entity_dbl_handler_2(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ intptr_t callno = (intptr_t)XML_GetUserData(parser);

+ const char *text;

+ XML_Parser new_parser;

+ enum XML_Status rv;

+ if (callno == 0) {

+ /* Try different allocation levels for whole exercise */

+ text = ("<!ELEMENT doc (e+)>\n"

+ "<!ATTLIST doc xmlns CDATA #IMPLIED>\n"

+ "<!ELEMENT e EMPTY>\n");

+ XML_SetUserData(parser, (void *)(intptr_t)1);

+ new_parser = XML_ExternalEntityParserCreate(parser,

+ context,

+ NULL);

+ if (new_parser == NULL)

+ return XML_STATUS_ERROR;

+ rv = _XML_Parse_SINGLE_BYTES(new_parser, text, (int)strlen(text),

+ XML_TRUE);

+ } else {

+ /* Just run through once */

+ text = ("<?xml version='1.0' encoding='us-ascii'?>"

+ "<e/>");

+ new_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (new_parser == NULL)

+ return XML_STATUS_ERROR;

+ rv =_XML_Parse_SINGLE_BYTES(new_parser, text, (int)strlen(text),

+ XML_TRUE);

+ }

+ XML_ParserFree(new_parser);

+ if (rv == XML_STATUS_ERROR)

+ return XML_STATUS_ERROR;

+ return XML_STATUS_OK;

+/* Test more external entity allocation failure paths */

+START_TEST(test_alloc_external_entity)

+ const char *text =

+ "<?xml version='1.0'?>\n"

+ "<!DOCTYPE doc SYSTEM 'http://example.org/doc.dtd' [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/entity.ent'>\n"

+ "]>\n"

+ "<doc xmlns='http://example.org/ns1'>\n"

+ "&en;\n"

+ "</doc>";

+ int i;

+ const int alloc_test_max_repeats = 50;

+ for (i = 0; i < alloc_test_max_repeats; i++) {

+ allocation_count = -1;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_dbl_handler_2);

+ XML_SetUserData(parser, NULL);

+ allocation_count = i;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ allocation_count = -1;

+ if (i == 0)

+ fail("External entity parsed despite duff allocator");

+ if (i == alloc_test_max_repeats)

+ fail("External entity not parsed at max allocation count");

+END_TEST

+/* Test more allocation failure paths */

+static int XMLCALL

+external_entity_alloc_set_encoding(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ /* As for external_entity_loader() */

+ const char *text =

+ "<?xml encoding='iso-8859-3'?>"

+ "\xC3\xA9";

+ XML_Parser ext_parser;

+ enum XML_Status status;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ return XML_STATUS_ERROR;

+ if (!XML_SetEncoding(ext_parser, XCS("utf-8"))) {

+ XML_ParserFree(ext_parser);

+ return XML_STATUS_ERROR;

+ }

+ status = _XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE);

+ XML_ParserFree(ext_parser);

+ if (status == XML_STATUS_ERROR)

+ return XML_STATUS_ERROR;

+ return XML_STATUS_OK;

+START_TEST(test_alloc_ext_entity_set_encoding)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ int i;

+ const int max_allocation_count = 30;

+ for (i = 0; i < max_allocation_count; i++) {

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_alloc_set_encoding);

+ allocation_count = i;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ break;

+ allocation_count = -1;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Encoding check succeeded despite failing allocator");

+ if (i == max_allocation_count)

+ fail("Encoding failed at max allocation count");

+END_TEST

+static int XMLCALL

+unknown_released_encoding_handler(void *UNUSED_P(data),

+ const XML_Char *encoding,

+ XML_Encoding *info)

+ if (!xcstrcmp(encoding, XCS("unsupported-encoding"))) {

+ int i;

+ for (i = 0; i < 256; i++)

+ info->map[i] = i;

+ info->data = NULL;

+ info->convert = NULL;

+ info->release = dummy_release;

+ return XML_STATUS_OK;

+ }

+ return XML_STATUS_ERROR;

+/* Test the effects of allocation failure in internal entities.

+ * Based on test_unknown_encoding_internal_entity

+ */

+START_TEST(test_alloc_internal_entity)

+ const char *text =

+ "<?xml version='1.0' encoding='unsupported-encoding'?>\n"

+ "<!DOCTYPE test [<!ENTITY foo 'bar'>]>\n"

+ "<test a='&foo;'/>";

+ unsigned int i;

+ const unsigned int max_alloc_count = 20;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetUnknownEncodingHandler(parser,

+ unknown_released_encoding_handler,

+ NULL);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text), XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Internal entity worked despite failing allocations");

+ else if (i == max_alloc_count)

+ fail("Internal entity failed at max allocation count");

+END_TEST

+/* Test the robustness against allocation failure of element handling

+ * Based on test_dtd_default_handling().

+ */

+START_TEST(test_alloc_dtd_default_handling)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ENTITY e SYSTEM 'http://example.org/e'>\n"

+ "<!NOTATION n SYSTEM 'http://example.org/n'>\n"

+ "<!ENTITY e1 SYSTEM 'http://example.org/e' NDATA n>\n"

+ "<!ELEMENT doc (#PCDATA)>\n"

+ "<!ATTLIST doc a CDATA #IMPLIED>\n"

+ "<?pi in dtd?>\n"

+ "\n"

+ "]>\n"

+ "<doc><![CDATA[text in doc]]></doc>";

+ const XML_Char *expected = XCS("\n\n\n\n\n\n\n\n\n<doc>text in doc</doc>");

+ CharData storage;

+ int i;

+ const int max_alloc_count = 25;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ dummy_handler_flags = 0;

+ XML_SetDefaultHandler(parser, accumulate_characters);

+ XML_SetDoctypeDeclHandler(parser,

+ dummy_start_doctype_handler,

+ dummy_end_doctype_handler);

+ XML_SetEntityDeclHandler(parser, dummy_entity_decl_handler);

+ XML_SetNotationDeclHandler(parser, dummy_notation_decl_handler);

+ XML_SetElementDeclHandler(parser, dummy_element_decl_handler);

+ XML_SetAttlistDeclHandler(parser, dummy_attlist_decl_handler);

+ XML_SetProcessingInstructionHandler(parser, dummy_pi_handler);

+ XML_SetCommentHandler(parser, dummy_comment_handler);

+ XML_SetCdataSectionHandler(parser,

+ dummy_start_cdata_handler,

+ dummy_end_cdata_handler);

+ XML_SetUnparsedEntityDeclHandler(

+ parser,

+ dummy_unparsed_entity_decl_handler);

+ CharData_Init(&storage);

+ XML_SetUserData(parser, &storage);

+ XML_SetCharacterDataHandler(parser, accumulate_characters);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Default DTD parsed despite allocation failures");

+ if (i == max_alloc_count)

+ fail("Default DTD not parsed with maximum alloc count");

+ CharData_CheckXMLChars(&storage, expected);

+ if (dummy_handler_flags != (DUMMY_START_DOCTYPE_HANDLER_FLAG |

+ DUMMY_END_DOCTYPE_HANDLER_FLAG |

+ DUMMY_ENTITY_DECL_HANDLER_FLAG |

+ DUMMY_NOTATION_DECL_HANDLER_FLAG |

+ DUMMY_ELEMENT_DECL_HANDLER_FLAG |

+ DUMMY_ATTLIST_DECL_HANDLER_FLAG |

+ DUMMY_COMMENT_HANDLER_FLAG |

+ DUMMY_PI_HANDLER_FLAG |

+ DUMMY_START_CDATA_HANDLER_FLAG |

+ DUMMY_END_CDATA_HANDLER_FLAG |

+ DUMMY_UNPARSED_ENTITY_DECL_HANDLER_FLAG))

+ fail("Not all handlers were called");

+END_TEST

+/* Test robustness of XML_SetEncoding() with a failing allocator */

+START_TEST(test_alloc_explicit_encoding)

+ int i;

+ const int max_alloc_count = 5;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ if (XML_SetEncoding(parser, XCS("us-ascii")) == XML_STATUS_OK)

+ break;

+ }

+ if (i == 0)

+ fail("Encoding set despite failing allocator");

+ else if (i == max_alloc_count)

+ fail("Encoding not set at max allocation count");

+END_TEST

+/* Test robustness of XML_SetBase against a failing allocator */

+START_TEST(test_alloc_set_base)

+ const XML_Char *new_base = XCS("/local/file/name.xml");

+ int i;

+ const int max_alloc_count = 5;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ if (XML_SetBase(parser, new_base) == XML_STATUS_OK)

+ break;

+ }

+ if (i == 0)

+ fail("Base set despite failing allocator");

+ else if (i == max_alloc_count)

+ fail("Base not set with max allocation count");

+END_TEST

+/* Test buffer extension in the face of a duff reallocator */

+START_TEST(test_alloc_realloc_buffer)

+ const char *text = get_buffer_test_text;

+ void *buffer;

+ int i;

+ const int max_realloc_count = 10;

+ /* Get a smallish buffer */

+ for (i = 0; i < max_realloc_count; i++) {

+ reallocation_count = i;

+ buffer = XML_GetBuffer(parser, 1536);

+ if (buffer == NULL)

+ fail("1.5K buffer reallocation failed");

+ memcpy(buffer, text, strlen(text));

+ if (XML_ParseBuffer(parser, (int)strlen(text),

+ XML_FALSE) == XML_STATUS_OK)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ reallocation_count = -1;

+ if (i == 0)

+ fail("Parse succeeded with no reallocation");

+ else if (i == max_realloc_count)

+ fail("Parse failed with max reallocation count");

+END_TEST

+/* Same test for external entity parsers */

+static int XMLCALL

+external_entity_reallocator(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = get_buffer_test_text;

+ XML_Parser ext_parser;

+ void *buffer;

+ enum XML_Status status;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ fail("Could not create external entity parser");

+ reallocation_count = (intptr_t)XML_GetUserData(parser);

+ buffer = XML_GetBuffer(ext_parser, 1536);

+ if (buffer == NULL)

+ fail("Buffer allocation failed");

+ memcpy(buffer, text, strlen(text));

+ status = XML_ParseBuffer(ext_parser, (int)strlen(text), XML_FALSE);

+ reallocation_count = -1;

+ XML_ParserFree(ext_parser);

+ return (status == XML_STATUS_OK) ? XML_STATUS_OK : XML_STATUS_ERROR;

+START_TEST(test_alloc_ext_entity_realloc_buffer)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ " <!ENTITY en SYSTEM 'http://example.org/dummy.ent'>\n"

+ "]>\n"

+ "<doc>&en;</doc>";

+ int i;

+ const int max_realloc_count = 10;

+ for (i = 0; i < max_realloc_count; i++) {

+ XML_SetExternalEntityRefHandler(parser,

+ external_entity_reallocator);

+ XML_SetUserData(parser, (void *)(intptr_t)i);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) == XML_STATUS_OK)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Succeeded with no reallocations");

+ if (i == max_realloc_count)

+ fail("Failed with max reallocations");

+END_TEST

+/* Test elements with many attributes are handled correctly */

+START_TEST(test_alloc_realloc_many_attributes)

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ATTLIST doc za CDATA 'default'>\n"

+ "<!ATTLIST doc zb CDATA 'def2'>\n"

+ "<!ATTLIST doc zc CDATA 'def3'>\n"

+ "]>\n"

+ "<doc a='1'"

+ " b='2'"

+ " c='3'"

+ " d='4'"

+ " e='5'"

+ " f='6'"

+ " g='7'"

+ " h='8'"

+ " i='9'"

+ " j='10'"

+ " k='11'"

+ " l='12'"

+ " m='13'"

+ " n='14'"

+ " p='15'"

+ " q='16'"

+ " r='17'"

+ " s='18'>"

+ "</doc>";

+ int i;

+ const int max_realloc_count = 10;

+ for (i = 0; i < max_realloc_count; i++) {

+ reallocation_count = i;

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite no reallocations");

+ if (i == max_realloc_count)

+ fail("Parse failed at max reallocations");

+END_TEST

+/* Test handling of a public entity with failing allocator */

+START_TEST(test_alloc_public_entity_value)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/'>\n"

+ "<doc></doc>\n";

+ char dtd_text[] =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % e1 PUBLIC 'foo' 'bar.ent'>\n"

+ "<!ENTITY % "

+ /* Each line is 64 characters */

+ "ThisIsAStupidlyLongParameterNameIntendedToTriggerPoolGrowth12345"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ " '%e1;'>\n"

+ "%e1;\n";

+ int i;

+ const int max_alloc_count = 50;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ dummy_handler_flags = 0;

+ XML_SetUserData(parser, dtd_text);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_public);

+ /* Provoke a particular code path */

+ XML_SetEntityDeclHandler(parser, dummy_entity_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parsing worked despite failing allocation");

+ if (i == max_alloc_count)

+ fail("Parsing failed at max allocation count");

+ if (dummy_handler_flags != DUMMY_ENTITY_DECL_HANDLER_FLAG)

+ fail("Entity declaration handler not called");

+END_TEST

+START_TEST(test_alloc_realloc_subst_public_entity_value)

+ const char *text =

+ "<!DOCTYPE doc SYSTEM 'http://example.org/'>\n"

+ "<doc></doc>\n";

+ char dtd_text[] =

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ENTITY % "

+ /* Each line is 64 characters */

+ "ThisIsAStupidlyLongParameterNameIntendedToTriggerPoolGrowth12345"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ " PUBLIC 'foo' 'bar.ent'>\n"

+ "%ThisIsAStupidlyLongParameterNameIntendedToTriggerPoolGrowth12345"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP"

+ "ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOP;";

+ int i;

+ const int max_realloc_count = 10;

+ for (i = 0; i < max_realloc_count; i++) {

+ reallocation_count = i;

+ XML_SetUserData(parser, dtd_text);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetExternalEntityRefHandler(parser, external_entity_public);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parsing worked despite failing reallocation");

+ if (i == max_realloc_count)

+ fail("Parsing failed at max reallocation count");

+END_TEST

+START_TEST(test_alloc_parse_public_doctype)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<!DOCTYPE doc PUBLIC '"

+ /* 64 characters per line */

+ "http://example.com/a/long/enough/name/to/trigger/pool/growth/zz/"

+ "ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNO/"

+ "' 'test'>\n"

+ "<doc></doc>";

+ int i;

+ const int max_alloc_count = 25;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ dummy_handler_flags = 0;

+ XML_SetDoctypeDeclHandler(parser,

+ dummy_start_doctype_decl_handler,

+ dummy_end_doctype_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed at maximum allocation count");

+ if (dummy_handler_flags != (DUMMY_START_DOCTYPE_DECL_HANDLER_FLAG |

+ DUMMY_END_DOCTYPE_DECL_HANDLER_FLAG))

+ fail("Doctype handler functions not called");

+END_TEST

+START_TEST(test_alloc_parse_public_doctype_long_name)

+ const char *text =

+ "<?xml version='1.0' encoding='utf-8'?>\n"

+ "<!DOCTYPE doc PUBLIC 'http://example.com/foo' '"

+ /* 64 characters per line */

+ "ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNO/ABCDEFGHIJKLMNOP"

+ "'>\n"

+ "<doc></doc>";

+ int i;

+ const int max_alloc_count = 25;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetDoctypeDeclHandler(parser,

+ dummy_start_doctype_decl_handler,

+ dummy_end_doctype_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed at maximum allocation count");

+END_TEST

+static int XMLCALL

+external_entity_alloc(XML_Parser parser,

+ const XML_Char *context,

+ const XML_Char *UNUSED_P(base),

+ const XML_Char *UNUSED_P(systemId),

+ const XML_Char *UNUSED_P(publicId))

+ const char *text = (const char *)XML_GetUserData(parser);

+ XML_Parser ext_parser;

+ int parse_res;

+ ext_parser = XML_ExternalEntityParserCreate(parser, context, NULL);

+ if (ext_parser == NULL)

+ return XML_STATUS_ERROR;

+ parse_res = _XML_Parse_SINGLE_BYTES(ext_parser, text, (int)strlen(text),

+ XML_TRUE);

+ XML_ParserFree(ext_parser);

+ return parse_res;

+/* Test foreign DTD handling */

+START_TEST(test_alloc_set_foreign_dtd)

+ const char *text1 =

+ "<?xml version='1.0' encoding='us-ascii'?>\n"

+ "<doc>&entity;</doc>";

+ char text2[] = "<!ELEMENT doc (#PCDATA)*>";

+ int i;

+ const int max_alloc_count = 25;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ XML_SetUserData(parser, &text2);

+ XML_SetExternalEntityRefHandler(parser, external_entity_alloc);

+ if (XML_UseForeignDTD(parser, XML_TRUE) != XML_ERROR_NONE)

+ fail("Could not set foreign DTD");

+ if (_XML_Parse_SINGLE_BYTES(parser, text1, (int)strlen(text1),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed at maximum allocation count");

+END_TEST

+/* Test based on ibm/valid/P32/ibm32v04.xml */

+START_TEST(test_alloc_attribute_enum_value)

+ const char *text =

+ "<?xml version='1.0' standalone='no'?>\n"

+ "<!DOCTYPE animal SYSTEM 'test.dtd'>\n"

+ "<animal>This is a \n <a/> \n\nyellow tiger</animal>";

+ char dtd_text[] =

+ "<!ELEMENT animal (#PCDATA|a)*>\n"

+ "<!ELEMENT a EMPTY>\n"

+ "<!ATTLIST animal xml:space (default|preserve) 'preserve'>";

+ int i;

+ const int max_alloc_count = 30;

+ for (i = 0; i < max_alloc_count; i++) {

+ allocation_count = i;

+ XML_SetExternalEntityRefHandler(parser, external_entity_alloc);

+ XML_SetUserData(parser, dtd_text);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ /* An attribute list handler provokes a different code path */

+ XML_SetAttlistDeclHandler(parser, dummy_attlist_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing allocator");

+ if (i == max_alloc_count)

+ fail("Parse failed at maximum allocation count");

+END_TEST

+/* Test attribute enums sufficient to overflow the string pool */

+START_TEST(test_alloc_realloc_attribute_enum_value)

+ const char *text =

+ "<?xml version='1.0' standalone='no'?>\n"

+ "<!DOCTYPE animal SYSTEM 'test.dtd'>\n"

+ "<animal>This is a yellow tiger</animal>";

+ /* We wish to define a collection of attribute enums that will

+ * cause the string pool storing them to have to expand. This

+ * means more than 1024 bytes, including the parentheses and

+ * separator bars.

+ */

+ char dtd_text[] =

+ "<!ELEMENT animal (#PCDATA)*>\n"

+ "<!ATTLIST animal thing "

+ "(default"

+ /* Each line is 64 characters */

+ "|ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|BBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|CBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|DBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|EBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|FBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|GBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|HBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|IBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|JBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|KBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|LBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|MBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|NBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|OBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"

+ "|PBCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO)"

+ " 'default'>";

+ int i;

+ const int max_realloc_count = 10;

+ for (i = 0; i < max_realloc_count; i++) {

+ reallocation_count = i;

+ XML_SetExternalEntityRefHandler(parser, external_entity_alloc);

+ XML_SetUserData(parser, dtd_text);

+ XML_SetParamEntityParsing(parser, XML_PARAM_ENTITY_PARSING_ALWAYS);

+ /* An attribute list handler provokes a different code path */

+ XML_SetAttlistDeclHandler(parser, dummy_attlist_decl_handler);

+ if (_XML_Parse_SINGLE_BYTES(parser, text, (int)strlen(text),

+ XML_TRUE) != XML_STATUS_ERROR)

+ break;

+ /* See comment in test_alloc_parse_xdecl() */

+ alloc_teardown();

+ alloc_setup();

+ }

+ if (i == 0)

+ fail("Parse succeeded despite failing reallocator");

+ if (i == max_realloc_count)

+ fail("Parse failed at maximum reallocation count");

+END_TEST

+/* Test attribute enums in a #IMPLIED attribute forcing pool growth */

+START_TEST(test_alloc_realloc_implied_attribute)

+ /* Forcing this particular code path is a balancing act. The

+ * addition of the closing parenthesis and terminal NUL must be

+ * what pushes the string of enums over the 1024-byte limit,

+ * otherwise a different code path will pick up the realloc.

+ */

+ const char *text =

+ "<!DOCTYPE doc [\n"

+ "<!ELEMENT doc EMPTY>\n"

+ "<!ATTLIST doc a "

+ /* Each line is 64 characters */

+ "(ABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNOPABCDEFGHIJKLMNO"