From becf6afbdde2e27eb0d0c1bd8eebba8f3a01ca74 Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Tue, 3 Aug 2021 15:53:14 -0700
Subject: [PATCH] Block until all UUID bytes are read or EOF

---
 .../providers/MultiRecipientMessageProvider.java              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/providers/MultiRecipientMessageProvider.java b/service/src/main/java/org/whispersystems/textsecuregcm/providers/MultiRecipientMessageProvider.java
index 668a4a91e..a19cf087b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/providers/MultiRecipientMessageProvider.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/providers/MultiRecipientMessageProvider.java
@@ -78,13 +78,13 @@ public class MultiRecipientMessageProvider implements MessageBodyReader<MultiRec
   private UUID readUuid(InputStream stream) throws IOException {
     byte[] buffer = new byte[8];
 
-    int read = stream.read(buffer);
+    int read = stream.readNBytes(buffer, 0, 8);
     if (read != 8) {
       throw new IOException("Insufficient bytes for UUID");
     }
     long msb = convertNetworkByteOrderToLong(buffer);
 
-    read = stream.read(buffer);
+    read = stream.readNBytes(buffer, 0, 8);
     if (read != 8) {
       throw new IOException("Insufficient bytes for UUID");
     }