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

LazUtils: Prevent CopyDirTree copying to a subdirectory of source. Issue #28841.

Browse Source 
git-svn-id: trunk@51033 -
This commit is contained in:
juha 2015-12-25 18:39:32 +00:00
parent 81733b2e74
commit 6faa4e893c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/lazutils/fileutil.inc
View File

@ -704,8 +704,11 @@ begin
Flags:=Flags+[cffCreateDestDirectory];
Searcher.FFlags:=Flags;
Searcher.FCopyFailedCount:=0;
Searcher.FSourceDir:=SetDirSeparators(SourceDir);
Searcher.FTargetDir:=SetDirSeparators(TargetDir);
Searcher.FSourceDir:=TrimFilename(SetDirSeparators(SourceDir));
Searcher.FTargetDir:=TrimFilename(SetDirSeparators(TargetDir));
// Don't even try to copy to a subdirectory of SourceDir.
if {$if defined(Windows) or defined(darwin)}AnsiStartsText{$ELSE}AnsiStartsStr{$ENDIF}
(SourceDir, TargetDir) then Exit;
Searcher.Search(SourceDir);
Result:=True;
finally

2
components/lazutils/fileutil.pas
View File

@ -32,7 +32,7 @@ unit FileUtil;
interface
uses
Classes, SysUtils,
Classes, SysUtils, strutils,
Masks, LazUTF8, LazFileUtils;
{$if defined(Windows) or defined(darwin)}