shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-21 22:50:08 +03:00
Code

encoding: Fix decoding of large chunks

Browse Source 
After 95e81a36, we must support XML_ENC_ERR_SPACE when using built-in
encoding handlers.

Should fix #610.
This commit is contained in:
Nick Wellnhofer 2023-10-28 03:04:59 +02:00
parent 0c18af8306
commit 89d19534de
2 changed files with 65 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
encoding.c
View File

@ -1989,9 +1989,22 @@ xmlEncInputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
int ret;
if (handler->input != NULL) {
int oldinlen = *inlen;
ret = handler->input(out, outlen, in, inlen);
if (ret > 0)
ret = XML_ENC_ERR_SUCCESS;
if (ret >= 0) {
/*
* The built-in converters don't signal XML_ENC_ERR_SPACE.
*/
if (*inlen < oldinlen) {
if (*outlen > 0)
ret = XML_ENC_ERR_SPACE;
else
ret = XML_ENC_ERR_PARTIAL;
} else {
ret = XML_ENC_ERR_SUCCESS;
}
}
}
#ifdef LIBXML_ICONV_ENABLED
else if (handler->iconv_in != NULL) {
@ -2036,9 +2049,22 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
int ret;
if (handler->output != NULL) {
int oldinlen = *inlen;
ret = handler->output(out, outlen, in, inlen);
if (ret > 0)
ret = XML_ENC_ERR_SUCCESS;
if (ret >= 0) {
/*
* The built-in converters don't signal XML_ENC_ERR_SPACE.
*/
if (*inlen < oldinlen) {
if (*outlen > 0)
ret = XML_ENC_ERR_SPACE;
else
ret = XML_ENC_ERR_PARTIAL;
} else {
ret = XML_ENC_ERR_SUCCESS;
}
}
}
#ifdef LIBXML_ICONV_ENABLED
else if (handler->iconv_out != NULL) {

35
testparser.c
View File

@ -30,6 +30,40 @@ testHugePush(void) {
return err;
}
static int
testHugeEncodedChunk(void) {
xmlBufferPtr buf;
xmlChar *chunk;
xmlParserCtxtPtr ctxt;
int err, i;
/*
* Test the push parser with a built-in encoding handler like ISO-8859-1
* and a chunk larger than the initial decoded buffer (currently 4 KB).
*/
buf = xmlBufferCreate();
xmlBufferCat(buf,
BAD_CAST "<?xml version='1.0' encoding='ISO-8859-1'?>\n");
xmlBufferCat(buf, BAD_CAST "<doc><!-- ");
for (i = 0; i < 2000; i++)
xmlBufferCat(buf, BAD_CAST "0123456789");
xmlBufferCat(buf, BAD_CAST " --></doc>");
chunk = xmlBufferDetach(buf);
xmlBufferFree(buf);
ctxt = xmlCreatePushParserCtxt(NULL, NULL, NULL, 0, NULL);
xmlParseChunk(ctxt, (char *) chunk, xmlStrlen(chunk), 0);
xmlParseChunk(ctxt, NULL, 0, 1);
err = ctxt->wellFormed ? 0 : 1;
xmlFreeDoc(ctxt->myDoc);
xmlFreeParserCtxt(ctxt);
xmlFree(chunk);
return err;
}
#endif
int
@ -38,6 +72,7 @@ main(void) {
#ifdef LIBXML_PUSH_ENABLED
err |= testHugePush();
err |= testHugeEncodedChunk();
#endif
return err;