#65 AdvHD: Add sanity check on address operands to further ensure the…

… right disassembler gets picked
arcusmaximus · Aug 6, 2022 · 2fa7ee2 · 2fa7ee2
1 parent e612ac2
commit 2fa7ee2
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/VNTextPatch.Shared/Scripts/AdvHd/AdvHdDisassemblerBase.cs b/VNTextPatch.Shared/Scripts/AdvHd/AdvHdDisassemblerBase.cs
@@ -173,17 +173,26 @@ private object ReadOperand(char type)
                     return _reader.ReadInt32();
 
                 case 'a':
-                    AddressEncountered?.Invoke((int)_stream.Position);
-                    return _reader.ReadInt32();
+                {
+                    int offset = (int)_stream.Position;
+                    int addr = _reader.ReadInt32();
+                    if (addr < 0 || addr >= _stream.Length)
+                        throw new InvalidDataException();
+
+                    AddressEncountered?.Invoke(offset);
+                    return addr;
+                }
 
                 case 'f':
                     return _reader.ReadSingle();
 
                 case 's':
+                {
                     int offset = (int)_stream.Position;
                     _reader.SkipZeroTerminatedSjisString();
                     int length = (int)_stream.Position - offset;
                     return new Range(offset, length, ScriptStringType.Internal);
+                }
 
                 default:
                     throw new ArgumentException();