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

LazUtils: Masks: don not disable ranges and sets in TWindowsMask, and do not compile the mask in the constructor, so the constructor won't fail if a mask is invalid.

Browse Source
This commit is contained in:
Bart 2021-10-31 17:27:04 +01:00
parent 0a32776e98
commit 181e410434
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/lazutils/masks.pas
View File

@ -1162,7 +1162,10 @@ begin
fWindowsQuirkAllowed:=aWindowsQuirksAllowed;
fWindowsMask:=aMask;
inherited Create(aMask,aCaseSensitive,aOpcodesAllowed);
//don't compile on create: we do NOT want a crash in the constructor
{
Compile;
}
end;
procedure TWindowsMaskUTF8.Compile;
@ -1184,6 +1187,7 @@ procedure TWindowsMaskUTF8.Compile;
Result:=aMask;
end;
{
function EscapeSpecialChars(const aString: String): String;
var
j: integer;
@ -1196,7 +1200,7 @@ procedure TWindowsMaskUTF8.Compile;
end;
end;
end;
}
var
lFileNameMask: String;
lExtensionMask: String;
@ -1241,9 +1245,11 @@ begin
end;
end;
//Don't disable ranges for Windows
{
lFileNameMask:=EscapeSpecialChars(lFileNameMask);
lExtensionMask:=EscapeSpecialChars(lExtensionMask);
}
// Quirk "file???.ab?" matches "file1.ab1" and "file123.ab"
if wqFilenameEnd in fWindowsQuirkAllowed then begin
lFileNameMask:=OptionalQMarksAtEnd(lFileNameMask);