c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

- entities.c: fixed a possible NULL pointer deref introduced on

Browse Source 
the last change (Gediminas Paulauskas) and clean up a couple other
  mistakes
Daniel
This commit is contained in:
Daniel Veillard 2001-05-05 16:34:01 +00:00
parent 3a1528c5f9
commit 8c27d62383
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat May 5 18:32:22 CEST 2001 <Daniel.Veillard@imag.fr>
* entities.c: fixed a possible NULL pointer deref introduced on
the last change (Gediminas Paulauskas) and clean up a couple other
mistakes
Sat May 5 11:38:44 CEST 2001 <Daniel.Veillard@imag.fr>
* entities.c tree.c parser.c: fix a problem raised after 1.8.12

4
entities.c
View File

@ -660,7 +660,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
buf[sizeof(buf) - 1] = 0;
ptr = buf;
while (*ptr != 0) *out++ = *ptr++;
} else if ((doc->encoding != NULL) &&
} else if ((doc != NULL) && (doc->encoding != NULL) &&
(xmlStrEqual(doc->encoding, "UTF-8"))) {
/*
* We assume we have UTF-8 input.
@ -671,7 +671,6 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
if (*cur < 0xC0) {
fprintf(stderr,
"xmlEncodeEntitiesReentrant : input not UTF-8\n");
doc->encoding = xmlStrdup(BAD_CAST "ISO-8859-1");
#ifdef HAVE_SNPRINTF
snprintf(buf, sizeof(buf), "&#%d;", *cur);
#else
@ -706,7 +705,6 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input) {
if ((l == 1) || (!IS_CHAR(val))) {
fprintf(stderr,
"xmlEncodeEntitiesReentrant : char out of range\n");
doc->encoding = xmlStrdup(BAD_CAST "ISO-8859-1");
#ifdef HAVE_SNPRINTF
snprintf(buf, sizeof(buf), "&#%d;", *cur);
#else