Proper behavior with large files

lukebemishprojects · Dec 11, 2024 · fd56cfe · fd56cfe
1 parent ca04991
commit fd56cfe
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/src/main/java/dev/lukebemish/immaculate/ForkFormatter.java b/src/main/java/dev/lukebemish/immaculate/ForkFormatter.java
@@ -10,6 +10,7 @@
 import java.net.InetAddress;
 import java.net.Socket;
 import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -115,8 +116,13 @@ private SocketHandle(Socket socket) throws IOException {
 
         synchronized void writeSubmission(int id, String fileName, String text) throws IOException {
             output.writeInt(id);
-            output.writeUTF(fileName);
-            output.writeUTF(text);
+            // We do not use writeUTF here as it is limited to strings with length less than 65535 bytes
+            var fileNameBytes = fileName.getBytes(StandardCharsets.UTF_8);
+            output.writeInt(fileNameBytes.length);
+            output.write(fileNameBytes);
+            var textBytes = text.getBytes(StandardCharsets.UTF_8);
+            output.writeInt(textBytes.length);
+            output.write(textBytes);
             output.flush();
         }
 
@@ -153,7 +159,10 @@ boolean readSuccess() throws IOException {
         }
 
         String readResult() throws IOException {
-            return input.readUTF();
+            // We do not use readUTF here as it is limited to strings with length less than 65535 bytes
+            int length = input.readInt();
+            var bytes = input.readNBytes(length);
+            return new String(bytes, StandardCharsets.UTF_8);
         }
     }
 

diff --git a/wrapper/src/main/java/dev/lukebemish/immaculate/wrapper/Main.java b/wrapper/src/main/java/dev/lukebemish/immaculate/wrapper/Main.java
@@ -6,6 +6,7 @@
 import java.lang.reflect.Constructor;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -115,7 +116,10 @@ synchronized void writeFailure(int id) throws IOException {
         synchronized void writeSuccess(int id, String result) throws IOException {
             output.writeInt(id);
             output.writeBoolean(true);
-            output.writeUTF(result);
+            // We do not use writeUTF here as it is limited to strings with length less than 65535 bytes
+            var resultBytes = result.getBytes(StandardCharsets.UTF_8);
+            output.writeInt(resultBytes.length);
+            output.write(resultBytes);
             output.flush();
         }
 
@@ -124,7 +128,10 @@ int readId() throws IOException {
         }
 
         String readUTF() throws IOException {
-            return input.readUTF();
+            // We do not use readUTF here as it is limited to strings with length less than 65535 bytes
+            int length = input.readInt();
+            var bytes = input.readNBytes(length);
+            return new String(bytes, StandardCharsets.UTF_8);
         }
     }
 }