lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-23 01:52:48 +03:00
Code Activity

io: Always consume encoding handler when creating output buffers

Browse Source 
Also free encoding handler in error case.

Remove xmlAllocOutputBufferInternal which was identical to
xmlAllocOutputBuffer.
This commit is contained in:
Nick Wellnhofer
2024-07-29 14:18:57 +02:00
parent 36ea881b9d
commit a530ff125d
4 changed files with 29 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
HTMLtree.c
View File

@@ -508,10 +508,8 @@ htmlNodeDumpFileFormat(FILE *out, xmlDocPtr doc,
*/
handler = htmlFindOutputEncoder(encoding);
buf = xmlOutputBufferCreateFile(out, handler);
if (buf == NULL) {
xmlCharEncCloseFunc(handler);
if (buf == NULL)
return(0);
}
htmlNodeDumpFormatOutput(buf, doc, cur, NULL, format);
@@ -560,11 +558,9 @@ htmlDocDumpMemoryFormat(xmlDocPtr cur, xmlChar**mem, int *size, int format) {
encoding = (const char *) htmlGetMetaEncoding(cur);
handler = htmlFindOutputEncoder(encoding);
buf = xmlAllocOutputBufferInternal(handler);
if (buf == NULL) {
xmlCharEncCloseFunc(handler);
buf = xmlAllocOutputBuffer(handler);
if (buf == NULL)
return;
}
htmlDocContentDumpFormatOutput(buf, cur, NULL, format);
@@ -1029,10 +1025,8 @@ htmlDocDump(FILE *f, xmlDocPtr cur) {
encoding = (const char *) htmlGetMetaEncoding(cur);
handler = htmlFindOutputEncoder(encoding);
buf = xmlOutputBufferCreateFile(f, handler);
if (buf == NULL) {
xmlCharEncCloseFunc(handler);
if (buf == NULL)
return(-1);
}
htmlDocContentDumpOutput(buf, cur, NULL);
ret = xmlOutputBufferClose(buf);
@@ -1063,10 +1057,8 @@ htmlSaveFile(const char *filename, xmlDocPtr cur) {
encoding = (const char *) htmlGetMetaEncoding(cur);
handler = htmlFindOutputEncoder(encoding);
buf = xmlOutputBufferCreateFilename(filename, handler, cur->compression);
if (buf == NULL) {
xmlCharEncCloseFunc(handler);
if (buf == NULL)
return(0);
}
htmlDocContentDumpOutput(buf, cur, NULL);
@@ -1107,10 +1099,8 @@ htmlSaveFileFormat(const char *filename, xmlDocPtr cur,
* save the content to a temp buffer.
*/
buf = xmlOutputBufferCreateFilename(filename, handler, 0);
if (buf == NULL) {
xmlCharEncCloseFunc(handler);
if (buf == NULL)
return(0);
}
htmlDocContentDumpFormatOutput(buf, cur, encoding, format);