From 925dfc462250f498a95dfe488302bf162a9629d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 28 Oct 2014 18:09:04 +0100
Subject: [PATCH] socket debugger: 2bytes for string length

---
 .../flash/debugger/DebugConnection.as         |   3 +-
 .../flash/gui/debugger/Debugger.java          |  48 ++++++++++--------
 .../decompiler/flash/gui/debugger/debug.swf   | Bin 1732 -> 1748 bytes
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/libsrc/debugswf/com/jpexs/decompiler/flash/debugger/DebugConnection.as b/libsrc/debugswf/com/jpexs/decompiler/flash/debugger/DebugConnection.as
index 4d0008532..0a5e01a62 100644
--- a/libsrc/debugswf/com/jpexs/decompiler/flash/debugger/DebugConnection.as
+++ b/libsrc/debugswf/com/jpexs/decompiler/flash/debugger/DebugConnection.as
@@ -26,7 +26,8 @@
 		private static function writeString(msg){
 			var b:ByteArray = new ByteArray();			
    			b.writeUTFBytes(msg);						
-			s.writeByte(b.length);
+			s.writeByte((b.length>>8) & 0xff);
+			s.writeByte(b.length & 0xff);
 			s.writeBytes(b,0,b.length);						
 		}
 		
diff --git a/src/com/jpexs/decompiler/flash/gui/debugger/Debugger.java b/src/com/jpexs/decompiler/flash/gui/debugger/Debugger.java
index c7cdb3dbb..b6dc83336 100644
--- a/src/com/jpexs/decompiler/flash/gui/debugger/Debugger.java
+++ b/src/com/jpexs/decompiler/flash/gui/debugger/Debugger.java
@@ -51,25 +51,31 @@ public class Debugger {
             }
         }
 
-        private String readString(InputStream is) throws IOException
-        {
+        private String readString(InputStream is) throws IOException {
             int len = is.read();
-                        if (len == -1) {
-                            throw new EOFException();
-                        }
-                        byte buf[] = new byte[len];
-                        for(int i=0;i<len;i++){
-                            int rd = is.read();
-                            if(rd == -1){
-                                throw new EOFException();
-                            }
-                            buf[i] = (byte)rd;
-                        }                                                
-                        return new String(buf, "UTF-8");                        
+            if (len == -1) {
+                throw new EOFException();
+            }
+            int len2 = is.read();
+            if (len2 == -1) {
+                throw new EOFException();
+            }
+            len = (len << 8) + len2;
+
+            byte buf[] = new byte[len];
+            for (int i = 0; i < len; i++) {
+                int rd = is.read();
+                if (rd == -1) {
+                    throw new EOFException();
+                }
+                buf[i] = (byte) rd;
+            }
+            return new String(buf, "UTF-8");
         }
+
         @Override
         public void run() {
-            String clientName = ""+id;
+            String clientName = "" + id;
             try (InputStream is = s.getInputStream()) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -89,7 +95,7 @@ public class Debugger {
                     }
                 } else {
                     String name = readString(is);
-                    if(!name.equals("")){
+                    if (!name.equals("")) {
                         clientName = name;
                     }
                     while (true) {
@@ -98,8 +104,8 @@ public class Debugger {
                             l.onMessage(clientName, ret);
                         }
                     }
-                }            
-                
+                }
+
             } catch (IOException ex) {
                 //ignore
             }
@@ -128,9 +134,9 @@ public class Debugger {
 
         @Override
         public void run() {
-            try {               
-                ss = new ServerSocket(port,50,InetAddress.getByName("localhost"));
-                ss.setReuseAddress(true);                
+            try {
+                ss = new ServerSocket(port, 50, InetAddress.getByName("localhost"));
+                ss.setReuseAddress(true);
                 while (true) {
                     Socket s = ss.accept();
                     if (s != null) {
diff --git a/src/com/jpexs/decompiler/flash/gui/debugger/debug.swf b/src/com/jpexs/decompiler/flash/gui/debugger/debug.swf
index f6851e435a60272a4ab34184e85e07e8ee1692e3..4eeec885b8fb64d77935a1aa15d2ab16ced128de 100644
GIT binary patch
literal 1748
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

literal 1732
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
a+`%tX#p#B>#g`<1`6U5Q8RLJWcUecU=4{FU