diff --git a/sandboxed_api/sandbox2/unwind/unwind.cc b/sandboxed_api/sandbox2/unwind/unwind.cc index 047d51c..4b927b9 100644 --- a/sandboxed_api/sandbox2/unwind/unwind.cc +++ b/sandboxed_api/sandbox2/unwind/unwind.cc @@ -271,14 +271,8 @@ bool RunLibUnwindAndSymbolizer(Comms* comms) { EnablePtraceEmulationWithUserRegs(setup.pid(), setup.regs(), mem_fd); - absl::StatusOr> ips = - RunLibUnwind(setup.pid(), setup.default_max_frames()); - absl::StatusOr> stack_trace; - if (ips.ok()) { - stack_trace = SymbolizeStacktrace(setup.pid(), *ips); - } else { - stack_trace = ips.status(); - } + absl::StatusOr> stack_trace = + RunLibUnwindAndSymbolizer(setup.pid(), setup.default_max_frames()); if (!comms->SendStatus(stack_trace.status())) { return false; @@ -290,7 +284,6 @@ bool RunLibUnwindAndSymbolizer(Comms* comms) { UnwindResult msg; *msg.mutable_stacktrace() = {stack_trace->begin(), stack_trace->end()}; - *msg.mutable_ip() = {ips->begin(), ips->end()}; return comms->SendProtoBuf(msg); } diff --git a/sandboxed_api/sandbox2/unwind/unwind.proto b/sandboxed_api/sandbox2/unwind/unwind.proto index 24b1c62..220e454 100644 --- a/sandboxed_api/sandbox2/unwind/unwind.proto +++ b/sandboxed_api/sandbox2/unwind/unwind.proto @@ -30,6 +30,5 @@ message UnwindSetup { message UnwindResult { // Readable stacktrace, symbolized, one frame per line repeated string stacktrace = 1; - // Stack frames - repeated uint64 ip = 2; + reserved 2; }