From 8e77c078d68ebd25d70f92f70a5aa630b19c7ee2 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Thu, 26 Aug 2010 21:38:51 +0000 Subject: Limit the number of frames we try to walk to prevent runaway processors. Review URL: http://breakpad.appspot.com/175001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@672 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/processor/stackwalker.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/processor') diff --git a/src/processor/stackwalker.cc b/src/processor/stackwalker.cc index 8552e2f3..39eb65ec 100644 --- a/src/processor/stackwalker.cc +++ b/src/processor/stackwalker.cc @@ -55,6 +55,7 @@ namespace google_breakpad { +u_int32_t Stackwalker::max_frames_ = 1024; Stackwalker::Stackwalker(const SystemInfo *system_info, MemoryRegion *memory, @@ -120,6 +121,10 @@ bool Stackwalker::Walk(CallStack *stack) { // Add the frame to the call stack. Relinquish the ownership claim // over the frame, because the stack now owns it. stack->frames_.push_back(frame.release()); + if (stack->frames_.size() > max_frames_) { + BPLOG(ERROR) << "The stack is over " << max_frames_ << " frames."; + break; + } // Get the next frame and take ownership. frame.reset(GetCallerFrame(stack)); @@ -166,7 +171,7 @@ Stackwalker* Stackwalker::StackwalkerForCPU( memory, modules, supplier, resolver); break; - + case MD_CONTEXT_SPARC: cpu_stackwalker = new StackwalkerSPARC(system_info, context->GetContextSPARC(), -- cgit v1.2.1