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

* fix potential range check error in cfileutl, should resolve #19405

Browse Source 
git-svn-id: trunk@17660 -
This commit is contained in:
florian 2011-06-04 22:14:55 +00:00
parent 93e53e1990
commit 33de8c8336
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/cfileutl.pas
View File

@ -52,7 +52,7 @@ interface
FDirectoryEntries : TFPHashList; FDirectoryEntries : TFPHashList;
FCached : Boolean; FCached : Boolean;
procedure FreeDirectoryEntries; procedure FreeDirectoryEntries;
function GetItemAttr(const AName: TCmdStr): byte; function GetItemAttr(const AName: TCmdStr): longint;
function TryUseCache: boolean; function TryUseCache: boolean;
procedure ForceUseCache; procedure ForceUseCache;
procedure Reload; procedure Reload;
@ -236,7 +236,7 @@ end;
end; end;
function TCachedDirectory.GetItemAttr(const AName: TCmdStr): byte; function TCachedDirectory.GetItemAttr(const AName: TCmdStr): longint;
var var
entry: PCachedDirectoryEntry; entry: PCachedDirectoryEntry;
begin begin
@ -523,8 +523,8 @@ end;
if (length(s)>0) and (s[1] in AllowDirectorySeparators) then if (length(s)>0) and (s[1] in AllowDirectorySeparators) then
result:=true; result:=true;
{$elseif defined(amiga) or defined(morphos)} {$elseif defined(amiga) or defined(morphos)}
(* An Amiga path is absolute, if it has a volume/device name in it (contains ":"), (* An Amiga path is absolute, if it has a volume/device name in it (contains ":"),
otherwise it's always a relative path, no matter if it starts with a directory otherwise it's always a relative path, no matter if it starts with a directory
separator or not. (KB) *) separator or not. (KB) *)
if (length(s)>0) and (Pos(':',s) <> 0) then if (length(s)>0) and (Pos(':',s) <> 0) then
result:=true; result:=true;