mirror of
https://github.com/GNOME/libxml2.git
synced 2025-10-14 11:37:29 +08:00
parser: Fix attribute normalization and standalone check
Regressed with e4cbc295
.
This commit is contained in:
4
parser.c
4
parser.c
@@ -4025,7 +4025,7 @@ xmlParseAttValueInternal(xmlParserCtxtPtr ctxt, int *attlen, int *outFlags,
|
|||||||
int c, l, quote, entFlags, chunkSize;
|
int c, l, quote, entFlags, chunkSize;
|
||||||
int inSpace = 1;
|
int inSpace = 1;
|
||||||
int replaceEntities;
|
int replaceEntities;
|
||||||
int normalize = (special & XML_SPECIAL_TYPE_MASK) != 0;
|
int normalize = (special & XML_SPECIAL_TYPE_MASK) > XML_ATTRIBUTE_CDATA;
|
||||||
int attvalFlags = 0;
|
int attvalFlags = 0;
|
||||||
|
|
||||||
/* Always expand namespace URIs */
|
/* Always expand namespace URIs */
|
||||||
@@ -8578,7 +8578,7 @@ xmlParseAttribute2(xmlParserCtxtPtr ctxt,
|
|||||||
|
|
||||||
#ifdef LIBXML_VALID_ENABLED
|
#ifdef LIBXML_VALID_ENABLED
|
||||||
if ((ctxt->validate) &&
|
if ((ctxt->validate) &&
|
||||||
(ctxt->standalone) &&
|
(ctxt->standalone == 1) &&
|
||||||
(special & XML_SPECIAL_EXTERNAL) &&
|
(special & XML_SPECIAL_EXTERNAL) &&
|
||||||
(flags & XML_ATTVAL_NORM_CHANGE)) {
|
(flags & XML_ATTVAL_NORM_CHANGE)) {
|
||||||
xmlValidityError(ctxt, XML_DTD_NOT_STANDALONE,
|
xmlValidityError(ctxt, XML_DTD_NOT_STANDALONE,
|
||||||
|
Reference in New Issue
Block a user