paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-06 09:50:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* xmlread.pp, fixed skipping DTD in canonical mode: ReadTopLevel was not recurring, but exiting with undefined result (happened to be 'true' most of the time). This went unnoticed due to redundant check in TLoader.ParseContent.

Browse Source 
git-svn-id: trunk@20645 -
This commit is contained in:
sergei 2012-03-28 10:42:45 +00:00
parent 0658a6ee88
commit bab72f0025
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1527,8 +1527,7 @@ begin
cursor := TDOMNode_WithChildren(cursor.ParentNode);
ntDocumentType:
if not FCanonical then
cursor.InternalAppend(TDOMDocumentType.Create(doc, FDocType));
cursor.InternalAppend(TDOMDocumentType.Create(doc, FDocType));
ntEntityReference:
cursor.InternalAppend(doc.CreateEntityReference(FCurrNode^.FQName^.Key));
@ -3464,7 +3463,7 @@ begin
if FCanonical then
begin
// recurse, effectively ignoring the DTD
result := ReadTopLevel;
result := ReadTopLevel();
Exit;
end;
end;