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

* fixes from WP reported on forum "non blocking bugs in chmcmd"

Browse Source 
git-svn-id: trunk@36747 -
This commit is contained in:
marco 2017-07-19 07:49:10 +00:00
parent 6fdd952fd9
commit f3e55c4019
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/chm/src/chmfilewriter.pas
View File

@ -717,8 +717,8 @@ begin
end;
const
protocols : array[0..3] of string = ('HTTP:','FTP:','MS-ITS:', 'MAILTO:');
protocollen : array[0..3] of integer= ( 5 ,4 ,7, 7);
protocols : array[0..4] of string = ('HTTP:','HTTPS:','FTP:','MS-ITS:', 'MAILTO:');
protocollen : array[0..4] of integer= ( 5 ,6, 4 ,7, 7);
function TChmProject.SanitizeURL(const basepath,instring,localpath,localname:string;var outstring:String):Boolean;
var i,j,len : integer;
@ -813,7 +813,8 @@ end;
function scantags(prnt:TDomNode; const localname: string; filelist:TStringlist):TDomNode;
// Seach first matching tag in siblings
var chld: TDomNode;
s : ansistring;
s,
att : ansistring;
i : Integer;
begin
result:=nil;
@ -845,19 +846,24 @@ begin
begin
//printattributes(chld,'');
checkattributes(chld,'HREF',localname,filelist);
s := findattribute(chld,'NAME');
att := 'NAME';
s := findattribute(chld, att);
if s = '' then begin
att := 'ID';
s := findattribute(chld, att);
end;
if s <> '' then
begin
i := fAnchorList.IndexOf(localname+'#'+s);
if i < 0 then begin
fAnchorList.Add(localname+'#'+s);
Error(ChmNote,'New Anchor with name '+s+' found while scanning '+localname,1);
Error(ChmNote,'New Anchor with '+att+' '+s+' found while scanning '+localname,1);
end else if fAnchorList.Objects[i] = nil then
Error(chmwarning,'Duplicate anchor definitions with name '+s+' found while scanning '+localname,1)
Error(chmwarning,'Duplicate anchor definitions with '+att+' '+s+' found while scanning '+localname,1)
else begin
fAnchorList.Objects[i].Free;
fAnchorList.Objects[i] := nil;
Error(ChmNote,'Anchor with name '+s+' defined while scanning '+localname,1);
Error(ChmNote,'Anchor with '+att+' '+s+' defined while scanning '+localname,1);
end;
end;
end;