defend against PosOffTable in spec

diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index 1e76280926c49e71dc48e0232c8bd7a416628816..226598c2121419b0316474a7fba6aa5d81879d1e 100644 (file)
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -250,6 +250,9 @@ fn execute_game_insn(cs: &CommandStream,
           gen: gs.gen,
           pos, p, face,
         };
+        if let (_, true) = pc.pos.clamped(gs.table_size) {
+          throw!(SpecError::PosOffTable);
+        }
         let piece = gs.pieces.insert(pc);
         updates.push((piece, PieceUpdateOp::Insert(())));
         pos[0] += posd[0];

diff --git a/src/spec.rs b/src/spec.rs
index a2e5e34975b6a2b8153082f3cc1d857fc485d135..f13d6bcbb466800ce194cd3503b036d9c19c9e84 100644 (file)
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -35,6 +35,7 @@ pub enum SpecError {
   UnsupportedColourSpec,
   FaceNotFound,
   InternalError(String),
+  PosOffTable,
 }
 display_as_debug!{SpecError}
 

diff --git a/src/updates.rs b/src/updates.rs
index 47de5eb71ef7306f7fb0594598bc8c3648eb5c5c..559bf702a15c779c4d8b4524a449d3def8b5a01f 100644 (file)
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -256,8 +256,6 @@ impl<'r> PrepareUpdatesBuffer<'r> {
                            lens: &dyn Lens) -> PreparedUpdateEntry {
     let gs = &mut self.g.gs;
 
-    // xxx enforce pos is within range,  everywhere
-
     let (update, piece) = match gs.pieces.byid_mut(piece) {
       Ok(pc) => {
         gs.max_z.update_max(pc.zlevel.z);