153aa9179Sopenharmony_ciFrom e2d37972e41224b11ff76f3a9fd689207b6108a6 Mon Sep 17 00:00:00 2001 253aa9179Sopenharmony_ciFrom: Nick Wellnhofer <wellnhofer@aevum.de> 353aa9179Sopenharmony_ciDate: Sun, 20 Nov 2022 15:35:49 +0100 453aa9179Sopenharmony_ciSubject: [PATCH 21/28] parser: Fix push parser with 1-3 byte initial chunk 553aa9179Sopenharmony_ci 653aa9179Sopenharmony_ciMake sure that ctxt->charset is initialized properly. 753aa9179Sopenharmony_ci 853aa9179Sopenharmony_ciReference: https://github.com/GNOME/libxml2/commit/55fb8f72ac726b4f760136070e0d2093ffcdb3ac 953aa9179Sopenharmony_ciConflict: NA 1053aa9179Sopenharmony_ci--- 1153aa9179Sopenharmony_ci parser.c | 7 ++++--- 1253aa9179Sopenharmony_ci 1 file changed, 4 insertions(+), 3 deletions(-) 1353aa9179Sopenharmony_ci 1453aa9179Sopenharmony_cidiff --git a/parser.c b/parser.c 1553aa9179Sopenharmony_ciindex 7553f86..4615db0 100644 1653aa9179Sopenharmony_ci--- a/parser.c 1753aa9179Sopenharmony_ci+++ b/parser.c 1853aa9179Sopenharmony_ci@@ -12523,9 +12523,10 @@ xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax, void *user_data, 1953aa9179Sopenharmony_ci * the encoding, we set the context to XML_CHAR_ENCODING_NONE so 2053aa9179Sopenharmony_ci * that it can be automatically determined later 2153aa9179Sopenharmony_ci */ 2253aa9179Sopenharmony_ci- if ((size == 0) || (chunk == NULL)) { 2353aa9179Sopenharmony_ci- ctxt->charset = XML_CHAR_ENCODING_NONE; 2453aa9179Sopenharmony_ci- } else if ((ctxt->input != NULL) && (ctxt->input->buf != NULL)) { 2553aa9179Sopenharmony_ci+ ctxt->charset = XML_CHAR_ENCODING_NONE; 2653aa9179Sopenharmony_ci+ 2753aa9179Sopenharmony_ci+ if ((size != 0) && (chunk != NULL) && 2853aa9179Sopenharmony_ci+ (ctxt->input != NULL) && (ctxt->input->buf != NULL)) { 2953aa9179Sopenharmony_ci size_t base = xmlBufGetInputBase(ctxt->input->buf->buffer, ctxt->input); 3053aa9179Sopenharmony_ci size_t cur = ctxt->input->cur - ctxt->input->base; 3153aa9179Sopenharmony_ci 3253aa9179Sopenharmony_ci-- 3353aa9179Sopenharmony_ci2.27.0 3453aa9179Sopenharmony_ci 35