Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-07 19:20:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-1902_dev747368_fix_DwarfEncodingModeDataType_npe'

Browse Source
This commit is contained in:
Ryan Kurtz 2022-04-11 14:00:28 -04:00
commit 3d9e0a6a8a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfDecoderFactory.java
View File

@ -15,6 +15,7 @@
*/
package ghidra.app.plugin.exceptionhandlers.gcc;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import ghidra.app.plugin.exceptionhandlers.gcc.datatype.SignedLeb128DataType;
@ -71,7 +72,7 @@ public class DwarfDecoderFactory {
private static DwarfEHDecoder createDecoder(DwarfEHDataDecodeFormat style,
DwarfEHDataApplicationMode mod, boolean isIndirect) {
switch (style) {
switch (Objects.requireNonNullElse(style, DwarfEHDataDecodeFormat.DW_EH_PE_omit)) {
case DW_EH_PE_absptr:
return new DW_EH_PE_absptr_Decoder(mod, isIndirect);
case DW_EH_PE_uleb128:

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/exceptionhandlers/gcc/DwarfEHDataDecodeFormat.java
View File

@ -1,6 +1,5 @@
/* ###
* IP: GHIDRA
* REVIEWED: YES
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,7 +17,7 @@ package ghidra.app.plugin.exceptionhandlers.gcc;
/**
* Exception handling data decoding formats.
* See the <a href="http://refspecs.freestandards.org/LSB_3.0.0/LSB-Core-generic/LSB-Core-generic/dwarfext.html">Linux Standard Base DWARF extensions specification</a> for details.
* See the <a href="https://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/dwarfext.html">Linux Standard Base DWARF extensions specification</a> for details.
*/
public enum DwarfEHDataDecodeFormat {
// @formatter:off