dasm: minor fix in flatten_graph

jjyg · Oct 10, 2022 · e2215f6 · e2215f6
1 parent 89fb16e
commit e2215f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metasm/disassemble.rb b/metasm/disassemble.rb
@@ -424,7 +424,7 @@ class Disassembler
 	attr_accessor :funcs_stdabi
 	# callback called whenever an instruction will backtrace :x (before the backtrace is started)
 	# arguments: |addr of origin, array of exprs to backtrace|
-	# must return the replacement array, nil == []
+	# returns the replacement array, nil == unmodified arg2
 	attr_accessor :callback_newaddr
 	# called whenever an instruction is decoded and added to an instruction block. arg: the new decoded instruction
 	# returns the new di to consider (nil to end block)

diff --git a/metasm/disassemble_api.rb b/metasm/disassemble_api.rb
@@ -852,7 +852,7 @@ def flatten_graph(entry, include_subfunc=true)
 				if tmp and tmp.length == 1
 					to = tmp[0]
 				else
-					to = b.list.last.next_addr
+					to = b.list.last.next_addr rescue nil
 				end
 				if (todo.include?(to) or done.include?(to)) and di_at(to)
 					if done.include?(to)