Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-22 23:49:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-831_ryanmkurtz_ida-PRs' (Closes

Browse Source 
#1897, Closes #2788, Closes #2882, Closes #2891)
This commit is contained in:
ghidra1
2021-04-02 17:39:06 -04:00
parent fe28442e49 59879f746e
commit 178b2437dd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GhidraBuild/IDAPro/Python/6xx/plugins/xmlexp.py
+1 -1
View File
@@ -261,7 +261,7 @@ class XmlExporter:
elif ch == '\'' : return "'"
elif ch == '"' : return """
elif ch == '\x7F': return ''
elif ord(ch) > 0x7F: return '&#x' + format((ord(ch),"x")) + ";"
elif ord(ch) > 0x7F: return '&#x' + format(ord(ch),"x") + ";"
return ch
GhidraBuild/IDAPro/Python/7xx/python/idaxml.py
+5 -5
View File
@@ -647,7 +647,7 @@ class XmlExporter(IdaXml):
# tag_remove seems to be losing last character
# work around is to add a space
cmt_text = ida_lines.tag_remove(cmt + ' ')
self.write_text(cmt_text)
self.write_text(cmt_text.decode('utf-8'))
self.end_element(COMMENT, False)
@@ -2395,7 +2395,7 @@ class XmlImporter(IdaXml):
# overlayed addresses not currently handled
return BADADDR
elif ':' in addrstr:
[segstr, offset_str] = string.split(addrstr,':')
[segstr, offset_str] = str.split(addrstr,':')
offset = int(offset_str,16)
if self.is_int(segstr) == True:
sgmt = int(segstr,16)
@@ -3111,11 +3111,11 @@ class XmlImporter(IdaXml):
"""
regcmt = member.find(REGULAR_CMT)
if regcmt != None:
idc.set_member_cmt(mbr, regcmt.text, False)
ida_struct.set_member_cmt(mbr, regcmt.text, False)
self.update_counter(MEMBER + ':' + REGULAR_CMT)
rptcmt = member.find(REPEATABLE_CMT)
if rptcmt != None:
idc.set_member_cmt(mbr, rptcmt.text, True)
ida_struct.set_member_cmt(mbr, rptcmt.text, True)
self.update_counter(MEMBER + ':' + REPEATABLE_CMT)
@@ -3239,7 +3239,7 @@ class XmlImporter(IdaXml):
idc.warning(msg)
return
elif ':' in addrstr:
[seg_str, offset_str] = string.split(addrstr,':')
[seg_str, offset_str] = str.split(addrstr,':')
offset = int(offset_str, 16)
if self.is_int(seg_str):
base = int(seg_str, 16)