Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-06-02 18:26:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-796_jmlagor_Fix_broken_tests_from_729'

Browse Source
This commit is contained in:
ghidra1
2021-03-23 13:59:43 -04:00
parent 01e8d50cec 93408f424c
commit b9e67994b1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/ImageRuntimeFunctionEntries.java
+4 -4
View File
@@ -155,8 +155,8 @@ public class ImageRuntimeFunctionEntries {
unwindInfo.version = (byte) (splitByte & UNWIND_INFO_VERSION_BITMASK); unwindInfo.version = (byte) (splitByte & UNWIND_INFO_VERSION_BITMASK);
unwindInfo.flags = (byte) (splitByte >> UNWIND_INFO_FLAGS_SHIFT); unwindInfo.flags = (byte) (splitByte >> UNWIND_INFO_FLAGS_SHIFT);
unwindInfo.sizeOfProlog = reader.readNextByte(); unwindInfo.sizeOfProlog = reader.readNextUnsignedByte();
unwindInfo.countOfUnwindCodes = reader.readNextByte(); unwindInfo.countOfUnwindCodes = reader.readNextUnsignedByte();
splitByte = reader.readNextByte(); splitByte = reader.readNextByte();
unwindInfo.frameRegister = (byte) (splitByte & UNWIND_INFO_FRAME_REGISTER_MASK); unwindInfo.frameRegister = (byte) (splitByte & UNWIND_INFO_FRAME_REGISTER_MASK);
@@ -307,8 +307,8 @@ public class ImageRuntimeFunctionEntries {
byte version; byte version;
byte flags; byte flags;
byte sizeOfProlog; int sizeOfProlog;
byte countOfUnwindCodes; int countOfUnwindCodes;
byte frameRegister; byte frameRegister;
byte frameOffset; byte frameOffset;
UNWIND_CODE[] unwindCodes; UNWIND_CODE[] unwindCodes;
Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/pe/cli/streams/CliStreamStringsTest.java → Ghidra/Features/Base/src/test/java/ghidra/app/util/bin/format/cli/streams/CliStreamStringsTest.java
+2 -1
View File
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package ghidra.app.util.bin.format.pe.cli.streams; package ghidra.app.util.bin.format.cli.streams;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@@ -26,6 +26,7 @@ import generic.test.AbstractGTest;
import ghidra.app.util.bin.BinaryReader; import ghidra.app.util.bin.BinaryReader;
import ghidra.app.util.bin.ByteArrayProvider; import ghidra.app.util.bin.ByteArrayProvider;
import ghidra.app.util.bin.format.pe.cli.CliStreamHeader; import ghidra.app.util.bin.format.pe.cli.CliStreamHeader;
import ghidra.app.util.bin.format.pe.cli.streams.CliStreamStrings;
import ghidra.util.LittleEndianDataConverter; import ghidra.util.LittleEndianDataConverter;
public class CliStreamStringsTest extends AbstractGTest { public class CliStreamStringsTest extends AbstractGTest {