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

fix bugs causing exceptions in ida import/export plugin

Browse source
This commit is contained in:
Tom Court 2019-07-10 09:24:59 +01:00
parent 8dd453dc2e
commit a17da1235e
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1642,8 +1642,10 @@ class XmlExporter(IdaXml):
cmt: String containing type info. cmt: String containing type info.
""" """
# older versions of IDAPython returned a '\n' at end of cmt # older versions of IDAPython returned a '\n' at end of cmt
if(len(cmt) > 0):
while cmt[-1] == '\n': while cmt[-1] == '\n':
cmt = cmt[:-1] cmt = cmt[:-1]
self.write_comment_element(TYPEINFO_CMT, cmt) self.write_comment_element(TYPEINFO_CMT, cmt)
@ -3444,7 +3446,7 @@ class XmlImporter(IdaXml):
if self.has_attribute(structure, NAMESPACE) == False: if self.has_attribute(structure, NAMESPACE) == False:
return return
namespace = self.get_attribute(structure, NAMESPACE) namespace = self.get_attribute(structure, NAMESPACE)
name = namspace + '__' + name name = namespace + '__' + name
name.replace('/','_') name.replace('/','_')
name.replace('.','_') name.replace('.','_')
dtyp = idc.get_struc_id(name) dtyp = idc.get_struc_id(name)
@ -3514,7 +3516,7 @@ class XmlImporter(IdaXml):
if self.has_attribute(union, NAMESPACE) == False: if self.has_attribute(union, NAMESPACE) == False:
return return
namespace = self.get_attribute(union, NAMESPACE) namespace = self.get_attribute(union, NAMESPACE)
name = namspace + '__' + name name = namespace + '__' + name
name.replace('/','_') name.replace('/','_')
name.replace('.','_') name.replace('.','_')
dtyp = idc.get_struc_id(name) dtyp = idc.get_struc_id(name)