diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-07-04 15:26:26 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-07-04 15:26:26 +0900 |
| commit | 1fdbfc1a277a788f8317ed47fccda22c587d3363 (patch) | |
| tree | 21e562b53122aaa5dd1d068d912c201454c040e9 /crates/shirabe/src/platform/version.rs | |
| parent | 51653e3e2f09df1d03454b25630c933764551970 (diff) | |
| download | php-shirabe-1fdbfc1a277a788f8317ed47fccda22c587d3363.tar.gz php-shirabe-1fdbfc1a277a788f8317ed47fccda22c587d3363.tar.zst php-shirabe-1fdbfc1a277a788f8317ed47fccda22c587d3363.zip | |
fix(pcre): restore missing regex delimiters in ported patterns
Several Preg::*() call sites lost their PHP delimiter (and in one case
the `i` modifier) during porting, since preg_*() expects the delimiter
to be preserved in the caller's pattern literal and stripped internally.
This made compile_php_pattern panic or silently misparse the pattern.
Un-ignore the Version tests that were blocked by this bug.
Diffstat (limited to 'crates/shirabe/src/platform/version.rs')
| -rw-r--r-- | crates/shirabe/src/platform/version.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index b78baad..cbbbe44 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -12,7 +12,7 @@ impl Version { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$", + r"/^(?P<version>[0-9.]+)(?P<patch>[a-z]{0,2})(?P<suffix>(?:-?(?:dev|pre|alpha|beta|rc|fips)[\d]*)*)(?:-\w+)?(?: \(.+?\))?$/", openssl_version, Some(&mut matches), ) { @@ -56,7 +56,7 @@ impl Version { pub fn parse_libjpeg(libjpeg_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"^(?P<major>\d+)(?P<minor>[a-z]*)$", + r"/^(?P<major>\d+)(?P<minor>[a-z]*)$/", libjpeg_version, Some(&mut matches), ) { @@ -81,7 +81,7 @@ impl Version { pub fn parse_zoneinfo_version(zoneinfo_version: &str) -> Option<String> { let mut matches: IndexMap<CaptureKey, String> = IndexMap::new(); if !Preg::match3( - r"^(?P<year>\d{4})(?P<revision>[a-z]*)$", + r"/^(?P<year>\d{4})(?P<revision>[a-z]*)$/", zoneinfo_version, Some(&mut matches), ) { |
