lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-28 00:21:53 +03:00
Code Activity

Good old cycle: new release, new bug reports, new fixes ...

Browse Source 
- HTMLtree.c HTMLtree.h : closing #53402 i.e. output of
  PIs when using xsl:output
- valid.c: closing #53537 some case generate segfaults if there
  is validity errors
Daniel
This commit is contained in:
Daniel Veillard
2001-04-24 15:52:00 +00:00
parent 61b33d5733
commit 7533cc8fda
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
valid.c
View File

@ -3286,7 +3286,7 @@ xmlValidateElementType(xmlValidCtxtPtr ctxt) {
return(1);
}
if (CONT == NULL) return(-1);
if (NODE->type == XML_ENTITY_REF_NODE)
if ((NODE != NULL) && (NODE->type == XML_ENTITY_REF_NODE))
return(-2);
/*
@ -3643,7 +3643,7 @@ xmlSprintfElements(char *buf, xmlNodePtr node, int glob) {
static int
xmlValidateElementContent(xmlValidCtxtPtr ctxt, xmlNodePtr child,
xmlElementContentPtr cont, int warn) {
xmlElementContentPtr cont, int warn, const xmlChar *name) {
int ret;
xmlNodePtr repl = NULL, last = NULL, cur, tmp;
@ -3757,10 +3757,10 @@ xmlValidateElementContent(xmlValidCtxtPtr ctxt, xmlNodePtr child,
else
xmlSprintfElements(list, child, 1);
if ((child->parent != NULL) && (child->parent->name != NULL)) {
if (name != NULL) {
VERROR(ctxt->userData,
"Element %s content doesn't follow the Dtd\nExpecting %s, got %s\n",
child->parent->name, expr, list);
name, expr, list);
} else {
VERROR(ctxt->userData,
"Element content doesn't follow the Dtd\nExpecting %s, got %s\n",
@ -3996,7 +3996,7 @@ child_ok:
case XML_ELEMENT_TYPE_ELEMENT:
child = elem->children;
cont = elemDecl->content;
ret = xmlValidateElementContent(ctxt, child, cont, 1);
ret = xmlValidateElementContent(ctxt, child, cont, 1, elem->name);
break;
}