From: Rhodri James <rhodri@kynesim.co.uk>
Date: Tue, 22 Aug 2017 13:59:01 +0000 (+0100)
Subject: Remove speculative test from byte_character_handler().
X-Git-Tag: R_2_2_5~24^2~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70d19d635a355da5b2cecf02ff6c01b3f56106ff;p=libexpat

Remove speculative test from byte_character_handler().

byte_character_handler() used to test that the string pointer `s`
passed to it was at the correct offset ino the input buffer.  This
is not guaranteed to be the case, and definitely won't be the case
if the input encoding has a different minimum bytes-per-character
to the internal encoding.
---

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 0d4e6355..698b1325 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -4151,7 +4151,7 @@ typedef struct ByteTestData {
 
 static void
 byte_character_handler(void *userData,
-                       const XML_Char *s,
+                       const XML_Char *UNUSED_P(s),
                        int len)
 {
 #ifdef XML_CONTEXT_BYTES
@@ -4172,8 +4172,6 @@ byte_character_handler(void *userData,
         fail("Character byte index incorrect");
     if (XML_GetCurrentByteCount(parser) != len)
         fail("Character byte count incorrect");
-    if (s != buffer + offset)
-        fail("Buffer position incorrect");
 #else
     (void)userData;
     (void)s;