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

GP-5199: per review

Browse source 
GP-5199: forgot a bit
GP-5199: fix for 0 length
This commit is contained in:
d-millar 2024-12-17 11:25:55 -05:00
parent 420dd7ce0c
commit c2224aa538
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/pe/debug/DebugMisc.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -83,8 +83,18 @@ public class DebugMisc implements StructConverter {
actualData = actualData =
(unicode ? reader.readNextUnicodeString(length) : reader.readNextAsciiString()); (unicode ? reader.readNextUnicodeString(length) : reader.readNextAsciiString());
} }
else if (length == 0 && !unicode) {
actualData = reader.readNextAsciiString();
// NB: should be a multiple of 4 per winnt.h
// 13 = len(start of struct) + null
length = (int) Math.ceil((actualData.length() + 13)/4.0)*4;
if (length > DebugDirectory.IMAGE_SIZEOF_DEBUG_DIRECTORY) {
length = DebugDirectory.IMAGE_SIZEOF_DEBUG_DIRECTORY;
}
Msg.warn(this, "Zero length structure - defaulting to " + Integer.toHexString(length));
}
else { else {
Msg.error(this, "Bad string length " + Integer.toHexString(length)); Msg.error(this, "Bad structure length " + Integer.toHexString(length));
} }
reader.setPointerIndex(oldIndex); reader.setPointerIndex(oldIndex);