Validate input UCI moves

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 2dacd1c2f37b3b9a18a66c1d340d041342f4bb31..673d661878a7b1b12ea687c9f9f9909bc355b227 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -120,6 +120,7 @@ namespace {
 
   void set_position(Position& pos, UCIParser& up) {
 
+    Move m;
     string token, fen;
 
     up >> token; // operator>>() skips any whitespace
@@ -139,8 +140,8 @@ namespace {
     else return;
 
     // Parse move list (if any)
-    while (up >> token)
-        pos.do_setup_move(move_from_uci(pos, token));
+    while (up >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
+        pos.do_setup_move(m);
   }
 
 
@@ -216,8 +217,6 @@ namespace {
     limits.time = time[pos.side_to_move()];
     limits.increment = inc[pos.side_to_move()];
 
-    assert(pos.is_ok());
-
     return think(pos, limits, searchMoves);
   }