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

Merge remote-tracking branch 'origin/GP-6713_dev747368_btreerootnode--SQUASHED'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-20 13:40:01 -04:00
parent af2b4ad12f 0e1484a20c
commit 603ba2e7bf
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPL/DMG/src/dmg/java/mobiledevices/dmg/btree/BTreeRootNodeDescriptor.java
+4 -1
View File
@@ -25,7 +25,10 @@ public class BTreeRootNodeDescriptor extends BTreeNodeDescriptor {
nodes.add( this );
int nodeSize = headerRecord.getNodeSize() & 0xffff;
int nodeSize = Short.toUnsignedInt(headerRecord.getNodeSize());
if (nodeSize == 0) {
throw new IOException("Bad nodeSize: " + nodeSize);
}
for ( int i = nodeSize ; i < reader.length() ; i += nodeSize ) {
reader.setPointerIndex( i );
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/btree/BTreeRootNodeDescriptor.java
+8 -5
View File
@@ -15,15 +15,15 @@
*/
package ghidra.file.formats.ios.btree;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import ghidra.app.util.bin.BinaryReader;
import ghidra.app.util.bin.StructConverterUtil;
import ghidra.program.model.data.DataType;
import ghidra.util.exception.DuplicateNameException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class BTreeRootNodeDescriptor extends BTreeNodeDescriptor {
private BTreeHeaderRecord headerRecord;
@@ -40,7 +40,10 @@ public class BTreeRootNodeDescriptor extends BTreeNodeDescriptor {
nodes.add( this );
int nodeSize = headerRecord.getNodeSize() & 0xffff;
int nodeSize = Short.toUnsignedInt(headerRecord.getNodeSize());
if (nodeSize == 0) {
throw new IOException("Bad nodeSize: " + nodeSize);
}
for ( int i = nodeSize ; i < reader.length() ; i += nodeSize ) {
reader.setPointerIndex( i );