paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* xmlread.pp, fixed an issue introduced by combination of r16046 and r16172: assigning doc.DocumentType only after DTD has been completely parsed prevented inner reader from parsing 2nd+ level entity references in default attribute values. This went unnoticed because of no positive tests, and was detected only by examining negative test diagnostic, namely for not-wf-sa-079 and not-wf-sa-080.

Browse Source 
git-svn-id: trunk@16248 -
This commit is contained in:
sergei 2010-10-28 20:23:42 +00:00
parent 12f6eb2c4e
commit d96e17da77
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/fcl-xml/src/xmlread.pp
View File

@ -1347,7 +1347,9 @@ begin
FXML11 := doc.InheritsFrom(TXMLDocument) and (TXMLDocument(doc).XMLVersion = '1.1');
NSPrepare;
Initialize(ASource);
FDocType := TDOMDocumentTypeEx(doc.DocType);
// See comment in EntityCheck()
if FDocType = nil then
FDocType := TDOMDocumentTypeEx(doc.DocType);
ParseContent;
end;
@ -1722,9 +1724,13 @@ begin
if not Result.FResolved then
begin
// To build children of the entity itself, we must parse it "out of context"
// However, care must be taken to properly pass the DTD to InnerReader.
// We now have doc.DocumentType=nil while DTD is being parsed,
// which can break parsing 2+ level entities in default attribute values.
InnerReader := TXMLReader.Create(FCtrl);
try
InnerReader.FAttrTag := FAttrTag;
InnerReader.FDocType := FDocType;
EntityToSource(Result, Src);
Result.SetReadOnly(False);
if Assigned(Src) then