Merge pull request #647 from dkimitsa/fix/debug/crash_on_non_ascii_names

* fixed: debugger crash if method/field contains non ansi characters in name
MobiVM · Apr 19, 2022 · ff6c0e7 · ff6c0e7
2 parents 31cc0e5 + b543a74
commit ff6c0e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...ins/debugger/src/main/java/org/robovm/debugger/debuginfo/DebuggerDebugObjectFileInfo.java b/...ins/debugger/src/main/java/org/robovm/debugger/debuginfo/DebuggerDebugObjectFileInfo.java
@@ -245,9 +245,13 @@ public static void dumpDebugInfoAsText(RawData debugInfo, File file) {
 //    }
 
     private  static void putStringWithLen(DataOutputStream stream, String str) throws IOException {
-        stream.writeInt(str.length());
-        if (!str.isEmpty())
-            stream.write(str.getBytes());
+        if (!str.isEmpty()) {
+            byte[] bytes = str.getBytes();
+            stream.writeInt(bytes.length);
+            stream.write(bytes);
+        } else {
+            stream.writeInt(0);
+        }
     }
 
 }
diff --git a/plugins/debugger/src/main/java/org/robovm/debugger/utils/bytebuffer/CompositeDataBuffer.java b/plugins/debugger/src/main/java/org/robovm/debugger/utils/bytebuffer/CompositeDataBuffer.java
@@ -138,7 +138,7 @@ public int readInt32() {
 
     @Override
     public long readLong() {
-        return activeRegion.readInt32();
+        return activeRegion.readLong();
     }
 
     @Override