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

GP-4955: The ElfLoader imagebase option can now contain a leading 0x

Browse source
This commit is contained in:
Ryan Kurtz 2024-10-01 13:43:42 -04:00
parent ff6988ad32
commit 9aba9d81be
8 changed files with 339 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/PDB/src/main/java/ghidra/app/util/bin/format/pdb/DefaultPdbMember.java
View file

@ -18,6 +18,7 @@ package ghidra.app.util.bin.format.pdb;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import ghidra.app.util.SymbolPathParser;
import ghidra.program.model.data.DataType;
@ -134,14 +135,15 @@ public class DefaultPdbMember extends PdbMember {
try {
int colonIndex = bitSizeOffsetStr.indexOf(':');
if (colonIndex > 0) {
bitFieldOffset = (int) NumericUtilities.parseNumber(
bitSizeOffsetStr.substring(colonIndex + 1));
bitFieldOffset =
NumericUtilities.parseInt(bitSizeOffsetStr.substring(colonIndex + 1));
bitSizeOffsetStr = bitSizeOffsetStr.substring(0, colonIndex);
}
else {
dataTypeParser.setMissingBitOffsetError();
}
bitFieldSize = (int) NumericUtilities.parseNumber(bitSizeOffsetStr);
NumberUtils.toInt(bitSizeOffsetStr, 0);
bitFieldSize = NumericUtilities.parseInt(bitSizeOffsetStr);
}
catch (NumberFormatException e) {
Msg.error(this, "Invalid PDB bitfield specification: " + name);