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

* skip empty path components in concatpaths, related to #40682

Browse Source 
(cherry picked from commit 2ec99cc82e)
This commit is contained in:
marcoonthegit 2024-04-03 14:40:32 +02:00
parent 15f377a60c
commit 9d39bcbdec
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtl/objpas/sysutils/fina.inc
View File

@ -510,12 +510,14 @@ function ConcatPaths(const Paths: array of PathStr): PathStr;
var var
I: Integer; I: Integer;
begin begin
Result := '';
if Length(Paths) > 0 then if Length(Paths) > 0 then
begin begin
if Paths[0]<>'' then
Result := Paths[0]; Result := Paths[0];
for I := 1 to Length(Paths) - 1 do for I := 1 to Length(Paths) - 1 do
if Paths[i]<>'' then
Result := IncludeTrailingPathDelimiter(Result) + ExcludeLeadingPathDelimiter(Paths[I]); Result := IncludeTrailingPathDelimiter(Result) + ExcludeLeadingPathDelimiter(Paths[I]);
end else end
Result := '';
end; end;