Magic-Mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-17 11:40:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-4856_d-millar_attributes_missing' (Closes #6825)
This commit is contained in:
Ryan Kurtz 2024-08-20 07:21:23 -04:00
commit 2c7addadc8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Ghidra/Debug/Debugger-agent-dbgeng/src/main/py/src/ghidradbg/commands.py
View File

@ -1413,14 +1413,14 @@ def update_by_container(np, keyval, obj):
if np.endswith("Frames"): if np.endswith("Frames"):
mo = util.get_object(obj.path) mo = util.get_object(obj.path)
map = util.get_attributes(mo) map = util.get_attributes(mo)
attr = map["Attributes"] if 'Attributes' in map:
if attr is None: attr = map["Attributes"]
return if attr is not None:
map = util.get_attributes(attr) map = util.get_attributes(attr)
pc = util.get_value(map["InstructionOffset"]) pc = util.get_value(map["InstructionOffset"])
(pc_base, pc_addr) = map_address(pc) (pc_base, pc_addr) = map_address(pc)
obj.set_value('Instruction Offset', pc_addr) obj.set_value('Instruction Offset', pc_addr)
key = '#{:x} 0x{:x}'.format(index, pc) key = '#{:x} 0x{:x}'.format(index, pc)
if np.endswith("Modules"): if np.endswith("Modules"):
create_generic(obj.path) create_generic(obj.path)
mo = util.get_object(obj.path) mo = util.get_object(obj.path)