Skip to content

Commit 213b8b7

Browse files
xPawxPaw
committed
Remove unbounded dot regex
1 parent 8bd100d commit 213b8b7

5 files changed

Lines changed: 206 additions & 55 deletions

File tree

‎rules.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RIM = \.rim$ ; BioWare
2222
RPF = \.rpf$ ; RAGE
2323
SCR = \.scr$ ; SCI
2424
SIERRA_EXE = (?:^|/)SIERRA\.EXE$ ; SCI
25-
SND_OGG = (?:^|/)snd?_.+\.ogg$ ; GameMaker
25+
SND_OGG = (?:^|/)snd?_\w+\.ogg$ ; GameMaker
2626
TAB = \.tab$ ; Apex Engine
2727
TGA = \.tga$ ; BioWare
2828
TLK = \.tlk$ ; BioWare
@@ -92,7 +92,7 @@ FPS_Creator = (?:^|/)Files/languagebank/english/textfiles/fpsc-050\.ini$
9292
Frostbite[] = (?:^|/)(?:Engine\.BuildInfo(?:_Win(?:64|32)_retail(?:_dll)?)?)\.dll$
9393
Frostbite[] = (?:^|/)Runtime_Win64_retail\.BuildSettings$
9494
GameBox = ^Nadeo\.ini$
95-
GameGuru = ^files/gamecore/projectiletypes/.+\.dds$
95+
GameGuru = ^files/gamecore/projectiletypes/\w+\.dds$
9696
GameMaker[] = (?:^|/)game\.(?:unx|ios)$
9797
GameMaker[] = (?:^|/)libYoYoGamepad\.dylib$
9898
GameMaker[] = (?:^|/)audiogroup1\.dat$

‎tests/Test.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@
4545
{
4646
$FailingTests[] = "$Type.$Name: Regex \"$Regex\" contains a capturing group";
4747
}
48+
49+
$RegexIssue = CheckRegexPerformance( $Regex );
50+
51+
if( $RegexIssue !== null )
52+
{
53+
$FailingTests[] = "$Type.$Name: Regex \"$Regex\" $RegexIssue";
54+
}
4855
}
4956
}
5057
}
@@ -147,6 +154,35 @@ function RegexHasCapturingGroups( string $regex ) : bool
147154
);
148155
}
149156

157+
function CheckRegexPerformance( string $regex ) : ?string
158+
{
159+
// Check for .+ or .*, skip if it's inside a character class like [.+]
160+
if( preg_match( '/(?<!\[)\.[\+\*]/', $regex ) )
161+
{
162+
return 'uses .+ or .* which is inefficient';
163+
}
164+
165+
// Patterns like (.+)+ or (a*)*
166+
if( preg_match( '/\([^)]*[\+\*][^)]*\)[\+\*]/', $regex ) )
167+
{
168+
return 'has nested quantifiers';
169+
}
170+
171+
// Quantifier applied to anchor
172+
if( preg_match( '/[\^\$][\+\*\?]/', $regex ) )
173+
{
174+
return 'has quantifier on anchor';
175+
}
176+
177+
// Empty alternation like (|foo) or (foo|)
178+
if( preg_match( '/\(\||\|\)/', $regex ) )
179+
{
180+
return 'has empty alternation';
181+
}
182+
183+
return null;
184+
}
185+
150186
/**
151187
* @param array<string, string|string[]> $Rulesets
152188
*/

‎tests/types/Engine.GameGuru.txt‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
files/gamecore/projectiletypes/----.dds
2-
files/gamecore/projectiletypes/---.dds
3-
files/gamecore/projectiletypes/--.dds
4-
files/gamecore/projectiletypes/-.dds
5-
files/gamecore/projectiletypes/1.dds
6-
files/gamecore/projectiletypes/11.dds
7-
files/gamecore/projectiletypes/111.dds
8-
files/gamecore/projectiletypes/1111.dds
9-
files/gamecore/projectiletypes/@.dds
10-
files/gamecore/projectiletypes/@@.dds
1+
files/gamecore/projectiletypes/33.dds
2+
files/gamecore/projectiletypes/333.dds
3+
files/gamecore/projectiletypes/3333.dds
4+
files/gamecore/projectiletypes/5.dds
5+
files/gamecore/projectiletypes/55.dds
6+
files/gamecore/projectiletypes/555.dds
7+
files/gamecore/projectiletypes/5555.dds
8+
files/gamecore/projectiletypes/BB.dds
9+
files/gamecore/projectiletypes/BBB.dds
10+
files/gamecore/projectiletypes/BBBB.dds
1111
files/gamecore/projectiletypes/Z.dds
1212
files/gamecore/projectiletypes/ZZ.dds
1313
files/gamecore/projectiletypes/ZZZ.dds
@@ -21,5 +21,3 @@ files/gamecore/projectiletypes/a.dds
2121
files/gamecore/projectiletypes/aa.dds
2222
files/gamecore/projectiletypes/aaa.dds
2323
files/gamecore/projectiletypes/aaaa.dds
24-
files/gamecore/projectiletypes/fantasy/fireball/_e_fireball_d.dds
25-
files/gamecore/projectiletypes/modern/handgrenade/_e_handgrenade_d.dds

‎tests/types/Evidence.SND_OGG.txt‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
/sn_----.ogg
2-
/sn_---.ogg
3-
/sn_--.ogg
4-
/sn_-.ogg
5-
/sn_1.ogg
6-
/sn_11.ogg
7-
/sn_111.ogg
8-
/sn_1111.ogg
9-
/sn_@.ogg
10-
/sn_@@.ogg
1+
/sn_33.ogg
2+
/sn_333.ogg
3+
/sn_3333.ogg
4+
/sn_5.ogg
5+
/sn_55.ogg
6+
/sn_555.ogg
7+
/sn_5555.ogg
8+
/sn_BB.ogg
9+
/sn_BBB.ogg
10+
/sn_BBBB.ogg
1111
/sn_Z.ogg
1212
/sn_ZZ.ogg
1313
/sn_ZZZ.ogg
@@ -20,16 +20,16 @@
2020
/sn_aa.ogg
2121
/sn_aaa.ogg
2222
/sn_aaaa.ogg
23-
/snd_----.ogg
24-
/snd_---.ogg
25-
/snd_--.ogg
26-
/snd_-.ogg
27-
/snd_1.ogg
28-
/snd_11.ogg
29-
/snd_111.ogg
30-
/snd_1111.ogg
31-
/snd_@.ogg
32-
/snd_@@.ogg
23+
/snd_33.ogg
24+
/snd_333.ogg
25+
/snd_3333.ogg
26+
/snd_5.ogg
27+
/snd_55.ogg
28+
/snd_555.ogg
29+
/snd_5555.ogg
30+
/snd_BB.ogg
31+
/snd_BBB.ogg
32+
/snd_BBBB.ogg
3333
/snd_Z.ogg
3434
/snd_ZZ.ogg
3535
/snd_ZZZ.ogg
@@ -42,16 +42,16 @@
4242
/snd_aa.ogg
4343
/snd_aaa.ogg
4444
/snd_aaaa.ogg
45-
sn_----.ogg
46-
sn_---.ogg
47-
sn_--.ogg
48-
sn_-.ogg
49-
sn_1.ogg
50-
sn_11.ogg
51-
sn_111.ogg
52-
sn_1111.ogg
53-
sn_@.ogg
54-
sn_@@.ogg
45+
sn_33.ogg
46+
sn_333.ogg
47+
sn_3333.ogg
48+
sn_5.ogg
49+
sn_55.ogg
50+
sn_555.ogg
51+
sn_5555.ogg
52+
sn_BB.ogg
53+
sn_BBB.ogg
54+
sn_BBBB.ogg
5555
sn_Z.ogg
5656
sn_ZZ.ogg
5757
sn_ZZZ.ogg
@@ -64,17 +64,16 @@ sn_a.ogg
6464
sn_aa.ogg
6565
sn_aaa.ogg
6666
sn_aaaa.ogg
67-
sn_whatever.ogg
68-
snd_----.ogg
69-
snd_---.ogg
70-
snd_--.ogg
71-
snd_-.ogg
72-
snd_1.ogg
73-
snd_11.ogg
74-
snd_111.ogg
75-
snd_1111.ogg
76-
snd_@.ogg
77-
snd_@@.ogg
67+
snd_33.ogg
68+
snd_333.ogg
69+
snd_3333.ogg
70+
snd_5.ogg
71+
snd_55.ogg
72+
snd_555.ogg
73+
snd_5555.ogg
74+
snd_BB.ogg
75+
snd_BBB.ogg
76+
snd_BBBB.ogg
7877
snd_Z.ogg
7978
snd_ZZ.ogg
8079
snd_ZZZ.ogg

‎tests/types/_NonMatchingTests.txt‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,3 +1413,121 @@ odin_dll
14131413
libodin_so
14141414
notodin.dll
14151415
notlibodin.so
1416+
AGSteam_dll
1417+
AGSteam.dlll
1418+
fAGSteam.dll
1419+
sub/dir/fAGSteam.dll
1420+
AGSteam.dl
1421+
gmsched_dll
1422+
gmsched.dlll
1423+
fgmsched.dll
1424+
sub/dir/fgmsched.dll
1425+
gmsched.dl
1426+
partner_xml_sig
1427+
partner.xml.sigg
1428+
fpartner.xml.sig
1429+
sub/dir/fpartner.xml.sig
1430+
partner.xml_sig
1431+
partner_xml.sig
1432+
yscfg_dat
1433+
yscfg.datt
1434+
fyscfg.dat
1435+
sub/dir/fyscfg.dat
1436+
yscfg.da
1437+
anybrainSDK_dll
1438+
anybrainSDK.dlll
1439+
fanybrainSDK.dll
1440+
sub/dir/fanybrainSDK.dll
1441+
anybrainSDK.dl
1442+
Cerebro_dll
1443+
Cerebro.dlll
1444+
fCerebro.dll
1445+
sub/dir/fCerebro.dll
1446+
Cerebro.dl
1447+
BlackCall_aes
1448+
BlackCall64_aes
1449+
BlackCall.aess
1450+
BlackCall64.aess
1451+
fBlackCall.aes
1452+
fBlackCall64.aes
1453+
sub/dir/fBlackCall.aes
1454+
BlackCall.ae
1455+
BlackCall65.aes
1456+
BlackCat64_sys
1457+
BlackCat64.syss
1458+
fBlackCat64.sys
1459+
sub/dir/fBlackCat64.sys
1460+
BlackCat64.sy
1461+
BlackCat32.sys
1462+
NEP2_dll
1463+
NEP2.dlll
1464+
fNEP2.dll
1465+
sub/dir/fNEP2.dll
1466+
NEP2.dl
1467+
NEP3.dll
1468+
gameguard_des
1469+
gameguard.dess
1470+
fgameguard.des
1471+
sub/dir/fgameguard.des
1472+
gameguard.de
1473+
gameguard.bes
1474+
opus_dll
1475+
opus.dlll
1476+
fopus.dll
1477+
sub/dir/fopus.dll
1478+
opus.dl
1479+
mus_test_ogg
1480+
mus_music_ogg
1481+
sub/dir/mus_test_ogg
1482+
snd_test_ogg
1483+
sn_test_ogg
1484+
sub/dir/snd_test_ogg
1485+
shared/shader_gar
1486+
shared_shader.gar
1487+
fshared/shader.gar
1488+
fmetadata.dat
1489+
sub/dir/fmetadata.dat
1490+
data_win
1491+
fdata.winn
1492+
options_ini
1493+
foptions.inii
1494+
pixi_js
1495+
fpixi.js
1496+
pixi.jss
1497+
Irrlicht_dll
1498+
Irrlicht.dlll
1499+
fIrrlicht.dll
1500+
sakanagl_dll
1501+
sakanagl.dlll
1502+
fsakanagl.dll
1503+
FalcoEngine_dll
1504+
FalcoEngine.dlll
1505+
fFalcoEngine.dll
1506+
wme_steam_dll
1507+
wme_steam.dlll
1508+
fwme_steam.dll
1509+
NeacSafe64_sys
1510+
NeacSafe64.syss
1511+
fNeacSafe64.sys
1512+
NeacSafe64_ex_sys
1513+
notFredaikisAntiCheat
1514+
FredaikisAntiCheat.dll
1515+
fFredaikisAntiCheat/
1516+
PnkBstrA_exe
1517+
PnkBstrA.exee
1518+
fPnkBstrA.exe
1519+
pbsv_dll
1520+
pbsv.dlll
1521+
fpbsv.dll
1522+
fdata.xp3f
1523+
krflash_dll
1524+
krflash.dlll
1525+
TrueAudioNext_dll
1526+
TrueAudioNext.dlll
1527+
fTrueAudioNext.dll
1528+
iZotope_dll
1529+
iZotope.dlll
1530+
fiZotope.dll
1531+
ortp_dll
1532+
ortp.dlll
1533+
fortp.dll

0 commit comments

Comments
 (0)