about summary refs log tree commit diff stats
path: root/miasm2/core/cpu.py
diff options
context:
space:
mode:
authorCamille Mougey <commial@gmail.com>2018-06-22 10:28:38 +0200
committerGitHub <noreply@github.com>2018-06-22 10:28:38 +0200
commit9f040a7013f471ecb96c5f64e5ab3f139d1a09c7 (patch)
treef4f21334788d6c153ce08cead01e614349cdf700 /miasm2/core/cpu.py
parent1c64ca68ff3ad2985d2c89b4b8a8e13ec282c0e1 (diff)
parent189d72985236b0b35586669e7d9309951ffdccb6 (diff)
downloadmiasm-9f040a7013f471ecb96c5f64e5ab3f139d1a09c7.tar.gz
miasm-9f040a7013f471ecb96c5f64e5ab3f139d1a09c7.zip
Merge branch 'master' into patch-2
Diffstat (limited to 'miasm2/core/cpu.py')
-rw-r--r--miasm2/core/cpu.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/miasm2/core/cpu.py b/miasm2/core/cpu.py
index a142ab77..80f81aff 100644
--- a/miasm2/core/cpu.py
+++ b/miasm2/core/cpu.py
@@ -1030,7 +1030,7 @@ class instruction(object):
                 if name == '_':
                     fixed_expr[exprloc] = self.get_asm_next_offset(exprloc)
                     continue
-                if not name in symbols:
+                if symbols.getby_name(name) is None:
                     raise ValueError('Unresolved symbol: %r' % exprloc)
 
                 offset = symbols.loc_key_to_offset(loc_key)