mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-25 17:00:36 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-03-05 13:22:49 -05:00
parent f466bb0037 4e4674be29
commit a7a795b335
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/EntryTable.java
View File

@@ -34,9 +34,9 @@ public class EntryTable {
* @param index the index where the entry table begins
* @param byteCount the length in bytes of the entry table
*/
EntryTable(BinaryReader reader, short index, short byteCount) throws IOException {
EntryTable(BinaryReader reader, int index, short byteCount) throws IOException {
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
ArrayList<EntryTableBundle> list = new ArrayList<EntryTableBundle>();
while (true) {

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/ImportedNameTable.java
View File

@@ -26,14 +26,14 @@ import ghidra.app.util.bin.BinaryReader;
*/
public class ImportedNameTable {
private BinaryReader reader;
private short index;
private int index;
/**
* Constructs a new imported name table.
* @param reader the binary reader
* @param index the index where the table begins
*/
ImportedNameTable(BinaryReader reader, short index) {
ImportedNameTable(BinaryReader reader, int index) {
this.reader = reader;
this.index = index;
}
@@ -48,7 +48,7 @@ public class ImportedNameTable {
*/
public LengthStringSet getNameAt(short offset) throws IOException {
long oldIndex = reader.getPointerIndex();
int newIndex = Short.toUnsignedInt(index) + Short.toUnsignedInt(offset);
int newIndex = index + Short.toUnsignedInt(offset);
reader.setPointerIndex(newIndex);
LengthStringSet lss = new LengthStringSet(reader);
reader.setPointerIndex(oldIndex);

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/InformationBlock.java
View File

@@ -194,10 +194,10 @@ public class InformationBlock {
private short ne_swaparea; // Minimum code swap area size
private short ne_expver; // Expected windows version number
InformationBlock(BinaryReader reader, short index)
InformationBlock(BinaryReader reader, int index)
throws InvalidWindowsHeaderException, IOException {
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
ne_magic = reader.readNextShort();

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/ModuleReferenceTable.java
View File

@@ -36,10 +36,10 @@ public class ModuleReferenceTable {
* @param count the count of modules referenced
* @param imp the imported name table
*/
ModuleReferenceTable(BinaryReader reader, short index, short count, ImportedNameTable imp)
ModuleReferenceTable(BinaryReader reader, int index, short count, ImportedNameTable imp)
throws IOException {
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
offsets = new short[Short.toUnsignedInt(count)];
for (short i = 0 ; i < count ; ++i) {

6
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/NewExecutable.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -44,7 +44,7 @@ public class NewExecutable {
if (dosHeader.isDosSignature()) {
try {
winHeader = new WindowsHeader(reader, baseAddr, (short) dosHeader.e_lfanew());
winHeader = new WindowsHeader(reader, baseAddr, dosHeader.e_lfanew());
}
catch (InvalidWindowsHeaderException e) {
}

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/ResidentNameTable.java
View File

@@ -27,9 +27,9 @@ import ghidra.app.util.bin.BinaryReader;
public class ResidentNameTable {
private LengthStringOrdinalSet [] names;
ResidentNameTable(BinaryReader reader, short index) throws IOException {
ResidentNameTable(BinaryReader reader, int index) throws IOException {
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
ArrayList<LengthStringOrdinalSet> list = new ArrayList<LengthStringOrdinalSet>();
while (true) {

8
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/ResourceTable.java
View File

@@ -28,7 +28,7 @@ import ghidra.app.util.bin.BinaryReader;
*
*/
public class ResourceTable {
private short index;
private int index;
private short alignmentShiftCount;
private ResourceType [] types;
private ResourceName [] names;
@@ -39,11 +39,11 @@ public class ResourceTable {
* @param index the byte index where the Resource Table begins,
* (this is relative to the beginning of the file
*/
ResourceTable(BinaryReader reader, short index) throws IOException {
ResourceTable(BinaryReader reader, int index) throws IOException {
this.index = index;
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
alignmentShiftCount = reader.readNextShort();
@@ -98,7 +98,7 @@ public class ResourceTable {
* relative to the beginning of the file.
* @return the byte index where the resource table begins
*/
public short getIndex() {
public int getIndex() {
return index;
}
}

4
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/SegmentTable.java
View File

@@ -28,10 +28,10 @@ import ghidra.program.model.address.SegmentedAddressSpace;
public class SegmentTable {
private Segment [] segments;
SegmentTable(BinaryReader reader, SegmentedAddress baseAddr, short index, short segmentCount,
SegmentTable(BinaryReader reader, SegmentedAddress baseAddr, int index, short segmentCount,
short shiftAlignCount) throws IOException {
long oldIndex = reader.getPointerIndex();
reader.setPointerIndex(Short.toUnsignedInt(index));
reader.setPointerIndex(index);
//create a value of the shift count...
shiftAlignCount = (short)(0x01 << shiftAlignCount);

18
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/ne/WindowsHeader.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,10 +49,10 @@ public class WindowsHeader {
* @throws IOException for problems reading the header bytes
*/
public WindowsHeader(BinaryReader reader, SegmentedAddress baseAddr,
short index) throws InvalidWindowsHeaderException, IOException {
int index) throws InvalidWindowsHeaderException, IOException {
this.infoBlock = new InformationBlock(reader, index);
short segTableIndex = (short)(infoBlock.getSegmentTableOffset() + index);
int segTableIndex = infoBlock.getSegmentTableOffset() + index;
this.segTable = new SegmentTable(reader,
baseAddr, segTableIndex, infoBlock.getSegmentCount(),
infoBlock.getSegmentAlignmentShiftCount());
@@ -60,22 +60,22 @@ public class WindowsHeader {
//if resource table offset == resident name table offset, then
//we do not have any resources...
if (infoBlock.getResourceTableOffset() != infoBlock.getResidentNameTableOffset()) {
short rsrcTableIndex = (short)(infoBlock.getResourceTableOffset() + index);
int rsrcTableIndex = infoBlock.getResourceTableOffset() + index;
this.rsrcTable = new ResourceTable(reader, rsrcTableIndex);
}
short resNameTableIndex = (short)(infoBlock.getResidentNameTableOffset() + index);
int resNameTableIndex = infoBlock.getResidentNameTableOffset() + index;
this.resNameTable = new ResidentNameTable(reader, resNameTableIndex);
short impNameTableIndex = (short)(infoBlock.getImportedNamesTableOffset() + index);
int impNameTableIndex = infoBlock.getImportedNamesTableOffset() + index;
this.impNameTable = new ImportedNameTable(reader, impNameTableIndex);
short modRefTableIndex = (short)(infoBlock.getModuleReferenceTableOffset() + index);
int modRefTableIndex = infoBlock.getModuleReferenceTableOffset() + index;
this.modRefTable = new ModuleReferenceTable(reader, modRefTableIndex,
infoBlock.getModuleReferenceTableCount(),
impNameTable);
short entryTableIndex = (short)(infoBlock.getEntryTableOffset() + index);
int entryTableIndex = infoBlock.getEntryTableOffset() + index;
this.entryTable = new EntryTable(reader, entryTableIndex, infoBlock.getEntryTableSize());
this.nonResNameTable = new NonResidentNameTable(reader,