REDCODE/BlenderSharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added check to avoid storing nullpointers in the pointers map. Updated comments.

Browse Source
This commit is contained in:
Samuele Lorefice
2025-02-21 17:04:13 +01:00
parent 9a0024884c
commit b5e0793692
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BlendFile/Reader.cs
View File

@@ -139,7 +139,7 @@ public class Reader {
/// <param name="fieldMetadata">Array of <see cref="FieldInfo"/>s containing <see cref="DNAFieldAttribute"/> attributes</param> /// <param name="fieldMetadata">Array of <see cref="FieldInfo"/>s containing <see cref="DNAFieldAttribute"/> attributes</param>
/// <param name="startOffset">offset in bytes from where structure starts in the block</param> /// <param name="startOffset">offset in bytes from where structure starts in the block</param>
private void FillObject(Kaitai.BlendFile.FileBlock block, ref object? obj, FieldInfo[] fieldMetadata, long startOffset = 0) { private void FillObject(Kaitai.BlendFile.FileBlock block, ref object? obj, FieldInfo[] fieldMetadata, long startOffset = 0) {
if(block.Code == "ENDB") return; if(block.Code == "ENDB") return;// ENDB is a special block that does not contain any data
foreach (var field in fieldMetadata) { foreach (var field in fieldMetadata) {
//Get the DNAFieldAttribute of the current field //Get the DNAFieldAttribute of the current field
var attrib = field.GetCustomAttribute<DNAFieldAttribute>(); var attrib = field.GetCustomAttribute<DNAFieldAttribute>();
@@ -166,7 +166,7 @@ public class Reader {
//Get the information of the fields of the new object //Get the information of the fields of the new object
var fieldInfo = newObj.GetType().GetFields(); var fieldInfo = newObj.GetType().GetFields();
//If the field is a pointer, we need to dereference it //If the field is not a pointer, we need to dereference it
if (!attrib.IsPointer) { if (!attrib.IsPointer) {
long relAddr = block.MemAddr.ToMemAddr() + offset; long relAddr = block.MemAddr.ToMemAddr() + offset;
if (objects.TryGetValue((relAddr, newObj.GetType()), out object? o)) { if (objects.TryGetValue((relAddr, newObj.GetType()), out object? o)) {
@@ -177,6 +177,8 @@ public class Reader {
//Fill the object with the data from the block (this is recursive) //Fill the object with the data from the block (this is recursive)
FillObject(block, ref newObj, fieldInfo, offset); FillObject(block, ref newObj, fieldInfo, offset);
} else { // if is a pointer, make a pointer to the pointer } else { // if is a pointer, make a pointer to the pointer
long memAddr = data.ToMemAddr();
if (memAddr == 0) continue; //nullPointer, no need to store the reference
pointers.TryAdd(block.MemAddr.ToMemAddr() + offset, data.ToMemAddr()); pointers.TryAdd(block.MemAddr.ToMemAddr() + offset, data.ToMemAddr());
} }
} }