development/ghidra
development/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra synced 2024-10-02 16:33:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GT-2998_ryanmkurtz_PR-774_teesee23_fix_ida_import_export_scripts'

Browse source
This commit is contained in:
Ryan Kurtz 2019-07-15 09:21:46 -04:00
parent 4813960784 bbfbd386ba
commit 5c92ed9ac4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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