paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-19 13:59:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* tried to apply patch of mantis #38169 in a more minimal way and fixing some of the omissions.

Browse Source 
git-svn-id: trunk@47703 -
This commit is contained in:
marco 2020-12-06 20:17:48 +00:00
parent d49453edba
commit 36eaa6c9ae
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/chm/src/chmreader.pas
View File

@ -480,9 +480,8 @@ begin
end;
function TChmReader.ReadURLSTR ( APosition: DWord ) : String;
var
URLStrURLOffset: DWord;
begin
result:='';
if not CheckCommonStreams then
Exit;
@ -1124,6 +1123,8 @@ var
function readvalue:string;
begin
result:='';
title:='';
if head<tail Then
begin
ind:=LEToN(plongint(head)^);
@ -1308,19 +1309,21 @@ var TryTextual : boolean;
begin
Result := nil; SiteMap:=Nil;
lookup:=TDictionary<string,TLookupRec>.create;
// First Try Binary
Index := GetObject('/$WWKeywordLinks/BTree');
if (Index = nil) or ForceXML then
begin
Result:=AbortAndTryTextual;
Result:=AbortAndTryTextual; // frees index if needed
Exit;
end;
if not CheckCommonStreams then
begin
Result:=AbortAndTryTextual;
index.free;
Result:=AbortAndTryTextual; // frees index if needed
Exit;
end;
lookup:=TDictionary<string,TLookupRec>.create;
SiteMap:=TChmSitemap.Create(StIndex);
itemstack :=TObjectList.create(false);
//Item :=Nil; // cached last created item, in case we need to make
@ -1349,9 +1352,10 @@ begin
if trytextual then
begin
sitemap.free;
Result:=AbortAndTryTextual;
Result:=AbortAndTryTextual; // frees index if needed
end
else Index.Free;
itemstack.free;
lookup.free;
end;