# HG changeset patch # User Nick Wellnhofer <wellnhofer@aevum.de> # Date 1661001304 -7200 # Sat Aug 20 15:15:04 2022 +0200 # Node ID 3fbb03dbf133bd9fdb9777f13d2d90be4b920be9 # Parent 8e47bfa4203382266b82597804b6396bc0d8e44b Create stream with buffer in xmlNewStringInputStream Create an input stream with a buffer in xmlNewStringInputStream. Otherwise, switching encodings won't work. See #34. diff --git a/parserInternals.c b/parserInternals.c --- a/parserInternals.c +++ b/parserInternals.c @@ -1345,6 +1345,7 @@ xmlParserInputPtr xmlNewStringInputStream(xmlParserCtxtPtr ctxt, const xmlChar *buffer) { xmlParserInputPtr input; + xmlParserInputBufferPtr buf; if (buffer == NULL) { xmlErrInternal(ctxt, "xmlNewStringInputStream string = NULL\n", @@ -1354,15 +1355,21 @@ if (xmlParserDebugEntities) xmlGenericError(xmlGenericErrorContext, "new fixed input: %.30s\n", buffer); + buf = xmlParserInputBufferCreateMem((const char *) buffer, + strlen((const char *) buffer), + XML_CHAR_ENCODING_NONE); + if (buf == NULL) { + xmlErrMemory(ctxt, NULL); + return(NULL); + } input = xmlNewInputStream(ctxt); if (input == NULL) { xmlErrMemory(ctxt, "couldn't allocate a new input stream\n"); + xmlFreeParserInputBuffer(buf); return(NULL); } - input->base = buffer; - input->cur = buffer; - input->length = xmlStrlen(buffer); - input->end = &buffer[input->length]; + input->buf = buf; + xmlBufResetInput(input->buf->buffer, input); return(input); }