Incorrectly reading the TypeArgumentIndex as a U2 (short) instead of …

…as a U1 (byte). Defined at https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.20 Fixes #438
ikvmnet · Oct 30, 2023 · bb52ee9 · bb52ee9
1 parent 03ec8b0
commit bb52ee9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/IKVM.ByteCode/Parsing/TypeAnnotationTypeArgumentTargetRecord.cs b/src/IKVM.ByteCode/Parsing/TypeAnnotationTypeArgumentTargetRecord.cs
@@ -1,7 +1,7 @@
 namespace IKVM.ByteCode.Parsing
 {
 
-    internal sealed record TypeAnnotationTypeArgumentTargetRecord(ushort Offset, ushort TypeArgumentIndex) : TypeAnnotationTargetRecord
+    internal sealed record TypeAnnotationTypeArgumentTargetRecord(ushort Offset, byte TypeArgumentIndex) : TypeAnnotationTargetRecord
     {
 
         public static bool TryRead(ref ClassFormatReader reader, out TypeAnnotationTargetRecord targetInfo)
@@ -10,7 +10,7 @@ public static bool TryRead(ref ClassFormatReader reader, out TypeAnnotationTarge
 
             if (reader.TryReadU2(out ushort offset) == false)
                 return false;
-            if (reader.TryReadU2(out ushort typeArgumentIndex) == false)
+            if (reader.TryReadU1(out byte typeArgumentIndex) == false)
                 return false;
 
             targetInfo = new TypeAnnotationTypeArgumentTargetRecord(offset, typeArgumentIndex);
@@ -25,7 +25,7 @@ public override int GetSize()
         {
             var length = 0;
             length += sizeof(ushort);
-            length += sizeof(ushort);
+            length += sizeof(byte);
             return length;
         }
 
@@ -38,7 +38,7 @@ public override bool TryWrite(ref ClassFormatWriter writer)
         {
             if (writer.TryWriteU2(Offset) == false)
                 return false;
-            if (writer.TryWriteU2(TypeArgumentIndex) == false)
+            if (writer.TryWriteU1(TypeArgumentIndex) == false)
                 return false;
 
             return true;