summaryrefslogtreecommitdiff
path: root/src/sam_edit.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-23 17:10:58 -0300
committerGabriel Schneider <[email protected]>2026-10-23 17:10:58 -0300
commit0073d05329335dbb0eb85f5c3044e42805d144e5 (patch)
tree744edfc317719b2018b1c3a8657c223aec058d47 /src/sam_edit.zig
parenta8b457a306a4442975210bcac3f04b56513c61c3 (diff)
downloadpardes-0073d05329335dbb0eb85f5c3044e42805d144e5.tar.gz
pardes-0073d05329335dbb0eb85f5c3044e42805d144e5.zip
Callstack lists every caller and pages a tree too big for one query; memory bounds and resident-size fixes
Callstack walks while the server answers, counts on the message row past a second, puts test callers last at each level, and ends a tree past one query's memory (memory.limits.arena.lsp_query, a 256 MiB region taken and given back per query) in a row whose Callstack shows the next page. Grep reads whole files. New hard limits: undo text per file, image decode pixels, the LSP snapshot of other open files, one paste. Safe builds no longer fill worst-case buffers with 0xAA (memory.unfilled), big regions are kept off transparent huge pages, and malloc_trim runs after big results. Also: Look's git show pages into a +Diff, and dropped marks in File. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'src/sam_edit.zig')
-rw-r--r--src/sam_edit.zig15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/sam_edit.zig b/src/sam_edit.zig
index f6253c89..94b76816 100644
--- a/src/sam_edit.zig
+++ b/src/sam_edit.zig
@@ -259,6 +259,10 @@ fn fail(why: *Why, comptime fmt: []const u8, args: anytype) Failure {
// ---- parsing: edit.c ----
+/// Commands one Edit may nest, loops (`x`, `y`, `g`, `v`, `X`, `Y`) and
+/// braces together: each level is a stack frame holding a compiled regex.
+pub const max_nest = 32;
+
const Parser = struct {
arena: std.mem.Allocator,
src: []const u8,
@@ -271,6 +275,9 @@ const Parser = struct {
open_text: bool = false,
/// The address being read had a `,` after a `"re"`.
file_comma: bool = false,
+ /// Commands open around the one being read, braces and loops alike:
+ /// each is a frame of `parse` and later of `execIn`, so it is bounded.
+ depth: u8 = 0,
why: *Why,
fn getch(ps: *Parser) ?u8 {
@@ -460,6 +467,9 @@ const Parser = struct {
/// edit.c:467, parsecmd.
fn parse(ps: *Parser, nest: u32) Failure!?*Cmd {
+ if (ps.depth >= max_nest) return fail(ps.why, "commands nested more than {d} deep", .{max_nest});
+ ps.depth += 1;
+ defer ps.depth -= 1;
var file_re: ?[]const u8 = null;
ps.file_comma = false;
const a = try ps.address(&file_re);
@@ -1163,6 +1173,11 @@ test "an Edit that fails halfway changes nothing, and says why in acme's words"
.{ "e /tmp/x", "can't open /tmp/x: no files here" },
.{ "\"zz\" p", "no file matches \"zz\"" },
.{ ",s/(a)/\\1/", "no \\1: mvzr keeps no submatches" },
+ .{ comptime deep: {
+ var loops: []const u8 = "";
+ for (0..40) |_| loops = loops ++ ",x/a/";
+ break :deep loops ++ "d";
+ }, "commands nested more than 32 deep" },
.{ "1 m 1,2", "move overlaps itself" },
.{ ",x/(^|\\n)foo/d", "bad regular expression: in a pattern with \\n, ^ can only come first and $ only just before a \\n" },
}) |c| {