From e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2 Mon Sep 17 00:00:00 2001 From: Benbuck Nason Date: Mon, 21 Aug 2017 15:02:01 -0700 Subject: [PATCH] Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation. --- expat/lib/xmltok.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/expat/lib/xmltok.c b/expat/lib/xmltok.c index 82e7acf3..f105a493 100644 --- a/expat/lib/xmltok.c +++ b/expat/lib/xmltok.c @@ -405,16 +405,20 @@ utf8_toUtf8(const ENCODING *UNUSED_P(enc), } /* Avoid copying partial characters (from incomplete input). */ - const char * const fromLimBefore = fromLim; - align_limit_to_full_utf8_characters(*fromP, &fromLim); - if (fromLim < fromLimBefore) { - input_incomplete = true; + { + const char * const fromLimBefore = fromLim; + align_limit_to_full_utf8_characters(*fromP, &fromLim); + if (fromLim < fromLimBefore) { + input_incomplete = true; + } } - const ptrdiff_t bytesToCopy = fromLim - *fromP; - memcpy(*toP, *fromP, bytesToCopy); - *fromP += bytesToCopy; - *toP += bytesToCopy; + { + const ptrdiff_t bytesToCopy = fromLim - *fromP; + memcpy(*toP, *fromP, bytesToCopy); + *fromP += bytesToCopy; + *toP += bytesToCopy; + } if (output_exhausted) // needs to go first return XML_CONVERT_OUTPUT_EXHAUSTED; -- 2.40.0