paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 23:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

XML writer: split CDATA sections at the ']]>' sequence.

Browse Source 
git-svn-id: trunk@14186 -
This commit is contained in:
sergei 2009-11-15 16:35:13 +00:00
parent 60a9ef963d
commit 5c60f0e9e2
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/fcl-xml/src/xmlwrite.pp
View File

@ -316,6 +316,7 @@ end;
const const
AttrSpecialChars = ['<', '"', '&', #9, #10, #13]; AttrSpecialChars = ['<', '"', '&', #9, #10, #13];
TextSpecialChars = ['<', '>', '&']; TextSpecialChars = ['<', '>', '&'];
CDSectSpecialChars = [']'];
procedure TXMLWriter.ConvWrite(const s: WideString; const SpecialChars: TSetOfChar; procedure TXMLWriter.ConvWrite(const s: WideString; const SpecialChars: TSetOfChar;
const SpecialCharCallback: TSpecialCharCallback); const SpecialCharCallback: TSpecialCharCallback);
@ -372,6 +373,19 @@ begin
end; end;
end; end;
procedure CDSectSpecialCharCallback(Sender: TXMLWriter; const s: DOMString;
var idx: Integer);
begin
if (idx <= Length(s)-2) and (s[idx+1] = ']') and (s[idx+2] = '>') then
begin
Sender.wrtStr(']]]]><![CDATA[>');
Inc(idx, 2);
// TODO: emit warning 'cdata-section-splitted'
end
else
Sender.wrtChr(s[idx]);
end;
procedure TXMLWriter.WriteNode(node: TDOMNode); procedure TXMLWriter.WriteNode(node: TDOMNode);
begin begin
case node.NodeType of case node.NodeType of
@ -598,7 +612,7 @@ begin
else else
begin begin
wrtChars('<![CDATA[', 9); wrtChars('<![CDATA[', 9);
wrtStr(TDOMCharacterData(node).Data); ConvWrite(TDOMCharacterData(node).Data, CDSectSpecialChars, @CDSectSpecialCharCallback);
wrtChars(']]>', 3); wrtChars(']]>', 3);
end; end;
end; end;