revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-25 16:22:43 +01:00
Code Issues Releases Wiki Activity

(stable) Fix two issues with repository monogram regular expressions

Browse source 
Summary: Ref T4245. Fixes T10172. These regular expressions were simply incorrect: they intend `<start> (form one | form two) <end>` but were written as `(<start> form one) | (form two <end>)` which allowed stuff like "R2/R13" to be interpreted as a monogram because it matches `(<start> form one)`.

Test Plan: Parsed commit `ba46ffa6169c` from RTEMS repository, see T10172. Before patch, got an identical trace; after patch, clean import.

Reviewers: chad, avivey

Reviewed By: avivey

Maniphest Tasks: T4245, T10172

Differential Revision: https://secure.phabricator.com/D15049
This commit is contained in:
epriestley 2016-01-18 09:32:54 -08:00
parent eac1124bd9
commit ba22159866
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
View file

@ -48,7 +48,7 @@ final class PhabricatorRepositoryRepositoryPHIDType
}
public function canLoadNamedObject($name) {
return preg_match('/^r[A-Z]+|R[1-9]\d*\z/', $name);
return preg_match('/^(r[A-Z]+|R[1-9]\d*)\z/', $name);
}
public function loadNamedObjects(

2
src/applications/repository/query/PhabricatorRepositoryQuery.php
View file

@ -65,7 +65,7 @@ final class PhabricatorRepositoryQuery
continue;
}
if (preg_match('/^(r[A-Z]+)|(R[1-9]\d*)\z/', $identifier)) {
if (preg_match('/^(r[A-Z]+|R[1-9]\d*)\z/', $identifier)) {
$monograms[$identifier] = $identifier;
continue;
}