runtime/vm/disassembler_ia32.cc - Issue 10915256: FIx crash in disassembler: check that an addrs is tagged before testing it to be part of the heap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/disassembler_ia32.cc

Issue 10915256: FIx crash in disassembler: check that an addrs is tagged before testing it to be part of the heap. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/disassembler_ia32.cc

===================================================================

--- runtime/vm/disassembler_ia32.cc (revision 12306)

+++ runtime/vm/disassembler_ia32.cc (working copy)

@@ -421,7 +421,8 @@

OS::SNPrint(addr_buffer, sizeof(addr_buffer), "%#"Px"", addr);

Print(addr_buffer);

// Try to print as heap object or stub name

- if (!Isolate::Current()->heap()->CodeContains(addr) &&

+ if (((addr & kSmiTagMask) == kHeapObjectTag) &&

+ !Isolate::Current()->heap()->CodeContains(addr) &&

Isolate::Current()->heap()->Contains(addr - kHeapObjectTag)) {

Object& obj = Object::Handle(reinterpret_cast<RawObject*>(addr));

if (obj.IsArray()) {

« no previous file with comments | « runtime/vm/assembler_x64.cc ('k') | runtime/vm/disassembler_x64.cc » ('j') | no next file with comments »