From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 11 Mar 2021 20:05:06 +0000 (+0000)
Subject: gamestate: Implement an overall pieces limit
X-Git-Tag: otter-0.4.0~146
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a8c58f3762027b504948f34662ac4aa5254ff48;p=otter.git

gamestate: Implement an overall pieces limit

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index a9c57638..c167326b 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -26,6 +26,7 @@ use MgmtResponse::Fine;
 
 const USERLIST: &str = "/etc/userlist";
 const CREATE_PIECES_MAX: u32 = 300;
+const OVERALL_PIECES_MAX: usize = 100_000; // don't make not fit in i32
 
 const DEFAULT_POS_START: Pos = PosC([20,20]);
 const DEFAULT_POS_DELTA: Pos = PosC([5,5]);
@@ -611,7 +612,10 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
       };
 
       let count_len = count.len();
-      if count.len() > CREATE_PIECES_MAX as usize { throw!(ME::LimitExceeded) }
+      if count_len > CREATE_PIECES_MAX as usize { throw!(ME::LimitExceeded) }
+      if gs.pieces.len() + count_len > OVERALL_PIECES_MAX {
+        throw!(ME::LimitExceeded)
+      }
       let posd = posd.unwrap_or(DEFAULT_POS_DELTA);
 
       let mut updates = Vec::with_capacity(count_len);