From b8d42c3a62d8c0e80b0b9b4dad029ffb351f9dc2 Mon Sep 17 00:00:00 2001
From: bart <9132501-flyingsheep@users.noreply.gitlab.com>
Date: Sat, 26 Dec 2015 13:50:01 +0000
Subject: [PATCH] LazUtils: Fix r51038 #10e166f60e for Issue #28841.

git-svn-id: trunk@51039 -
---
 components/lazutils/fileutil.inc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/lazutils/fileutil.inc b/components/lazutils/fileutil.inc
index 56cbf3b54d..42ef1ef620 100644
--- a/components/lazutils/fileutil.inc
+++ b/components/lazutils/fileutil.inc
@@ -696,7 +696,8 @@ end;
 function CopyDirTree(const SourceDir, TargetDir: string; Flags: TCopyFileFlags=[]): Boolean;
 var
   Searcher: TCopyDirTree;
-  Dummy: String;
+  RelPath: String;
+  B: Boolean;
 begin
   Result:=False;
   Searcher:=TCopyDirTree.Create;
@@ -709,8 +710,9 @@ begin
     Searcher.FTargetDir:=LazFileUtils.TrimFilename(SetDirSeparators(TargetDir));
 
     // Don't even try to copy to a subdirectory of SourceDir.
-    if TryCreateRelativePath(LazFileUtils.ExpandFilenameUtf8(Searcher.FSourceDir),
-      LazFileUtils.ExpandFilenameUtf8(Searcher.FTargetDir), False, True, {%H-}Dummy) then Exit;
+    B := TryCreateRelativePath(LazFileUtils.ExpandFilenameUtf8(Searcher.FSourceDir),
+      LazFileUtils.ExpandFilenameUtf8(Searcher.FTargetDir), False, True, RelPath);
+    if B and not ((Copy(RelPath,1,2) <> '..') and (RelPath <> '')) then Exit;
 
     Searcher.Search(SourceDir);
     Result:=Searcher.FCopyFailedCount=0;