From 5007019a2e858998954a7ede81825081c66b7330 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Sat, 21 Nov 2020 08:41:26 +0800
Subject: [PATCH] fix #204 - throw error if sent message is too long

---
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 5 +++++
 app/src/main/proto                                           | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 8e7cfab81..0c54748b1 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1458,6 +1458,11 @@ class MeshService : Service(), Logging {
                 // Keep a record of datapackets, so GUIs can show proper chat history
                 rememberDataPacket(p)
 
+                if(p.bytes.size >= MeshProtos.Constants.DATA_PAYLOAD_LEN.number) {
+                    p.status = MessageStatus.ERROR
+                    throw RemoteException("Message too long")
+                }
+
                 if (p.id != 0) { // If we have an ID we can wait for an ack or nak
                     deleteOldPackets()
                     sentPackets[p.id] = p
diff --git a/app/src/main/proto b/app/src/main/proto
index a0b8d8889..a36b31a43 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit a0b8d888961720d70ab7467c94d8fa0687e58020
+Subproject commit a36b31a43c53cab8e62ba04dfbb1fdcc9ecfe821