yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge branch 'GP-831_ryanmkurtz_PR-2891_aedrax_ida' into GP-831_ryanmkurtz_ida-PRs

Browse source
This commit is contained in:
Ryan Kurtz 2021-04-02 07:45:36 -04:00
commit 59879f746e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GhidraBuild/IDAPro/Python/7xx/python/idaxml.py
View file

@ -2395,7 +2395,7 @@ class XmlImporter(IdaXml):
# overlayed addresses not currently handled # overlayed addresses not currently handled
return BADADDR return BADADDR
elif ':' in addrstr: elif ':' in addrstr:
[segstr, offset_str] = string.split(addrstr,':') [segstr, offset_str] = str.split(addrstr,':')
offset = int(offset_str,16) offset = int(offset_str,16)
if self.is_int(segstr) == True: if self.is_int(segstr) == True:
sgmt = int(segstr,16) sgmt = int(segstr,16)
@ -3239,7 +3239,7 @@ class XmlImporter(IdaXml):
idc.warning(msg) idc.warning(msg)
return return
elif ':' in addrstr: elif ':' in addrstr:
[seg_str, offset_str] = string.split(addrstr,':') [seg_str, offset_str] = str.split(addrstr,':')
offset = int(offset_str, 16) offset = int(offset_str, 16)
if self.is_int(seg_str): if self.is_int(seg_str):
base = int(seg_str, 16) base = int(seg_str, 16)