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

GP-468 Temporary fix to address merge issue

Browse Source
This commit is contained in:
ghidra1 2021-01-14 11:50:51 -05:00
parent 1669831db8
commit b0a2791826
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuBuildIdDataType.java → Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuBuildIdSection.java
View File

@ -26,7 +26,7 @@ import ghidra.util.exception.DuplicateNameException;
* Factory data type that marks up a Gnu Build-Id record from a
* ELF .note.gnu.build-id section
*/
class GnuBuildIdDataType extends FactoryStructureDataType {
public class GnuBuildIdSection extends FactoryStructureDataType {
private static final int MAX_SANE_STR_LENS = 1024;
private long sectionSize;
@ -37,7 +37,7 @@ class GnuBuildIdDataType extends FactoryStructureDataType {
* @param sectionSize the size of the section (for bounds checking, assumes this
* is the only record in the section)
*/
GnuBuildIdDataType(DataTypeManager dtm, long sectionSize) {
public GnuBuildIdSection(DataTypeManager dtm, long sectionSize) {
super("Gnu_BuildId", dtm);
this.sectionSize = sectionSize;
}
@ -47,7 +47,7 @@ class GnuBuildIdDataType extends FactoryStructureDataType {
if (dtm == dataMgr) {
return this;
}
return new GnuBuildIdDataType(dtm, sectionSize);
return new GnuBuildIdSection(dtm, sectionSize);
}
@Override

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuDebugLinkDataType.java → Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/elf/GnuDebugLinkSection.java
View File

@ -26,7 +26,7 @@ import ghidra.util.exception.DuplicateNameException;
/**
* Factory data type that marks up a ELF .gnu_debuglink section.
*/
class GnuDebugLinkDataType extends FactoryStructureDataType {
public class GnuDebugLinkSection extends FactoryStructureDataType {
private long sectionSize;
/**
@ -35,7 +35,7 @@ class GnuDebugLinkDataType extends FactoryStructureDataType {
* @param dtm the program's {@link DataTypeManager}
* @param sectionSize the size of the section (for bounds checking)
*/
GnuDebugLinkDataType(DataTypeManager dtm, long sectionSize) {
public GnuDebugLinkSection(DataTypeManager dtm, long sectionSize) {
super("Gnu_DebugLink", dtm);
this.sectionSize = sectionSize;
}
@ -45,7 +45,7 @@ class GnuDebugLinkDataType extends FactoryStructureDataType {
if (dtm == dataMgr) {
return this;
}
return new GnuDebugLinkDataType(dtm, sectionSize);
return new GnuDebugLinkSection(dtm, sectionSize);
}
@Override

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfProgramBuilder.java
View File

@ -1910,7 +1910,7 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
}
try {
listing.createData(addr,
new GnuBuildIdDataType(program.getDataTypeManager(), sh.getSize()));
new GnuBuildIdSection(program.getDataTypeManager(), sh.getSize()));
}
catch (Exception e) {
log("Failed to properly markup Gnu Build-Id at " + addr + ": " + getMessage(e));
@ -1926,7 +1926,7 @@ class ElfProgramBuilder extends MemorySectionResolver implements ElfLoadHelper {
}
try {
listing.createData(addr,
new GnuDebugLinkDataType(program.getDataTypeManager(), sh.getSize()));
new GnuDebugLinkSection(program.getDataTypeManager(), sh.getSize()));
}
catch (Exception e) {
log("Failed to properly markup Gnu DebugLink at " + addr + ": " + getMessage(e));