Skip to content
Snippets Groups Projects
Commit 1ae6ec906772 authored by Nick Wellnhofer's avatar Nick Wellnhofer
Browse files

Only warn on invalid redeclarations of predefined entities

Downgrade the error message to a warning since the error was ignored,
anyway. Also print the name of redeclared entity. For a proper fix that
also shows filename and line number of the invalid redeclaration, we'd
have to

- pass the parser context to the entity functions somehow, or
- make these functions return distinct error codes.

Partial fix for #308.
parent 5d39f6e2c757
No related branches found
No related tags found
No related merge requests found
...@@ -94,6 +94,23 @@ ...@@ -94,6 +94,23 @@
__xmlSimpleError(XML_FROM_TREE, code, NULL, msg, NULL); __xmlSimpleError(XML_FROM_TREE, code, NULL, msg, NULL);
} }
/**
* xmlEntitiesWarn:
* @code: the error code
* @msg: the message
*
* Handle an out of memory condition
*/
static void LIBXML_ATTR_FORMAT(2,0)
xmlEntitiesWarn(xmlParserErrors code, const char *msg, const xmlChar *str1)
{
__xmlRaiseError(NULL, NULL, NULL,
NULL, NULL, XML_FROM_TREE, code,
XML_ERR_WARNING, NULL, 0,
(const char *)str1, NULL, NULL, 0, 0,
msg, (const char *)str1, NULL);
}
/* /*
* xmlFreeEntity : clean-up an entity record. * xmlFreeEntity : clean-up an entity record.
*/ */
...@@ -255,5 +272,5 @@ ...@@ -255,5 +272,5 @@
} }
} }
if (!valid) { if (!valid) {
xmlEntitiesErr(XML_ERR_ENTITY_PROCESSING, xmlEntitiesWarn(XML_ERR_ENTITY_PROCESSING,
"xmlAddEntity: invalid redeclaration of predefined" "xmlAddEntity: invalid redeclaration of predefined"
...@@ -259,5 +276,5 @@ ...@@ -259,5 +276,5 @@
"xmlAddEntity: invalid redeclaration of predefined" "xmlAddEntity: invalid redeclaration of predefined"
" entity"); " entity '%s'", name);
return(NULL); return(NULL);
} }
} }
......
<?xml version="1.0"?>
<!DOCTYPE doc>
<doc/>
warning : xmlAddEntity: invalid redeclaration of predefined entity 'lt'
warning : xmlAddEntity: invalid redeclaration of predefined entity 'lt'
warning : xmlAddEntity: invalid redeclaration of predefined entity 'lt'
<!DOCTYPE doc [
<!ENTITY lt '<'>
]>
<doc/>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment