mirror of
https://gitlab.gnome.org/GNOME/libxml2.git
synced 2025-07-29 11:41:22 +03:00
applied Gennady's patch against buffer overrun
This commit is contained in:
@ -2194,6 +2194,9 @@ retry:
|
|||||||
|
|
||||||
written = out->size - out->use;
|
written = out->size - out->use;
|
||||||
|
|
||||||
|
if (written > 0)
|
||||||
|
written--; /* Gennady: count '/0' */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* First specific handling of in = NULL, i.e. the initialization call
|
* First specific handling of in = NULL, i.e. the initialization call
|
||||||
*/
|
*/
|
||||||
@ -2202,8 +2205,10 @@ retry:
|
|||||||
if (handler->output != NULL) {
|
if (handler->output != NULL) {
|
||||||
ret = handler->output(&out->content[out->use], &written,
|
ret = handler->output(&out->content[out->use], &written,
|
||||||
NULL, &toconv);
|
NULL, &toconv);
|
||||||
out->use += written;
|
if (ret == 0) { /* Gennady: check return value */
|
||||||
out->content[out->use] = 0;
|
out->use += written;
|
||||||
|
out->content[out->use] = 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#ifdef LIBXML_ICONV_ENABLED
|
#ifdef LIBXML_ICONV_ENABLED
|
||||||
else if (handler->iconv_out != NULL) {
|
else if (handler->iconv_out != NULL) {
|
||||||
|
Reference in New Issue
Block a user