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

fixing #151456, an encoding error could generate a serialization loop.

Browse Source 
* xmlIO.c: fixing #151456, an encoding error could generate
  a serialization loop.
Daniel
This commit is contained in:
Daniel Veillard
2004-08-31 12:15:36 +00:00
parent 0bff36ddf7
commit 71b956387b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Aug 31 14:14:30 CEST 2004 Daniel Veillard <daniel@veillard.com>
* xmlIO.c: fixing #151456, an encoding error could generate
a serialization loop.
Tue Aug 31 11:34:04 CEST 2004 Daniel Veillard <daniel@veillard.com> Tue Aug 31 11:34:04 CEST 2004 Daniel Veillard <daniel@veillard.com>
* Makefile.am: also produce a tar ball with just the sources * Makefile.am: also produce a tar ball with just the sources

5
xmlIO.c
View File

@ -3024,6 +3024,7 @@ xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str,
int nbchars = 0; /* number of chars to output to I/O */ int nbchars = 0; /* number of chars to output to I/O */
int ret; /* return from function call */ int ret; /* return from function call */
int written = 0; /* number of char written to I/O so far */ int written = 0; /* number of char written to I/O so far */
int oldwritten=0;/* loop guard */
int chunk; /* number of byte currently processed from str */ int chunk; /* number of byte currently processed from str */
int len; /* number of bytes in str */ int len; /* number of bytes in str */
int cons; /* byte from str consumed */ int cons; /* byte from str consumed */
@ -3035,6 +3036,8 @@ xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str,
if (escaping == NULL) escaping = xmlEscapeContent; if (escaping == NULL) escaping = xmlEscapeContent;
do { do {
oldwritten = written;
/* /*
* how many bytes to consume and how many bytes to store. * how many bytes to consume and how many bytes to store.
*/ */
@ -3111,7 +3114,7 @@ xmlOutputBufferWriteEscape(xmlOutputBufferPtr out, const xmlChar *str,
xmlBufferResize(out->buffer, out->buffer->size + MINLEN); xmlBufferResize(out->buffer, out->buffer->size + MINLEN);
} }
written += nbchars; written += nbchars;
} while (len > 0); } while ((len > 0) && (oldwritten != written));
done: done:
#ifdef DEBUG_INPUT #ifdef DEBUG_INPUT