summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.zig4
-rw-r--r--src/CHANGELOG.md4
-rw-r--r--src/regexp.zig8
3 files changed, 16 insertions, 0 deletions
diff --git a/build.zig b/build.zig
index d99f3985..acd402b6 100644
--- a/build.zig
+++ b/build.zig
@@ -400,7 +400,11 @@ pub fn build(b: *std.Build) void {
if (std.mem.count(u8, backed, end_anchor) != 1) @panic("mvzr's parser changed: redo its `$` before `|` in build.zig");
var patched = std.mem.replaceOwned(u8, b.allocator, backed, end_anchor, end_before_alt) catch @panic("OOM");
// Zig 0.17 removed `**`; mvzr still has it (its PR #16 replaces it upstream).
+ // A class's range ending at `\xff` counted to 256 in a u8, an
+ // overflow (a panic in a safe build, a runaway loop in a fast one):
+ // `[\x80-\xff]` in any search took the editor down.
for ([_][3][]const u8{
+ .{ "for (c1..c2 + 1) |c_range|", "for (c1..@as(usize, c2) + 1) |c_range|", "1" },
.{ "[1]RegOp{.{ .unused = {} }} ** ops", "@splat(.{ .unused = {} })", "1" },
.{ "[1]CharSet{.{ .low = 0, .hi = 0 }} ** char_sets", "@splat(.{ .low = 0, .hi = 0 })", "1" },
.{ "\"a\" ** 2048", "&@as([2048]u8, @splat('a'))", "2" },
diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
index d4d237f0..ed8993c9 100644
--- a/src/CHANGELOG.md
+++ b/src/CHANGELOG.md
@@ -2,6 +2,10 @@
## Unreleased
+- A search with a class whose range ends at `\xff` (`[\x80-\xff]`, in an
+ address, `s`, a plumbing rule) no longer takes the editor down: mvzr
+ counted the range past a byte's end.
+
- The plumber, Plan 9's, is in the session: `plumb/rules` holds its
rules in plumb(6)'s language (rule sets of `object verb arg` lines,
variables, `include`, `matches` over the whole text or around a click,
diff --git a/src/regexp.zig b/src/regexp.zig
index 7bcbceff..87fc51d6 100644
--- a/src/regexp.zig
+++ b/src/regexp.zig
@@ -595,6 +595,14 @@ test "a \\x without two hex digits is refused, not handed to mvzr to panic on" {
try std.testing.expectEqual(@as(usize, 1), (try rx.find("xA", 0, 1, 2)).?.start);
}
+test "a class's range may end at \\xff: UTF-8's high bytes as one class" {
+ var rx = try Regex.compile("[a-z\\x80-\\xff]+");
+ const text = "-- café --";
+ const m = (try rx.find(text, 0, text.len, text.len)).?;
+ try std.testing.expectEqualStrings("café", text[m.start..m.end]);
+ _ = try Regex.compile("[\\xff-\\xff]");
+}
+
test "a repeat inside a group gives back to what follows the group" {
const Case = struct { pat: []const u8, text: []const u8, start: usize, end: usize };
for ([_]Case{