Position::move_is_capture() does not handle MOVE_NONE

[stockfish] / src / position.cpp

diff --git a/src/position.cpp b/src/position.cpp
index 47e1af2704e3eb21e08026d09d2a3c0bbe5dd461..98e79df2a82d2d661c9af66aa8d8004466da1bab 100644 (file)
--- a/src/position.cpp
+++ b/src/position.cpp
@@ -52,6 +52,7 @@ Key Position::zobSideToMove;
 Value Position::MgPieceSquareTable[16][64];
 Value Position::EgPieceSquareTable[16][64];
 
 Value Position::MgPieceSquareTable[16][64];
 Value Position::EgPieceSquareTable[16][64];
 

+static bool RequestPending = false;

 
 ////
 //// Functions
 
 ////
 //// Functions


@@ -272,12 +273,18 @@ void Position::print(Move m) const {
 
   static const std::string pieceLetters = " PNBRQK  PNBRQK .";
 
 
   static const std::string pieceLetters = " PNBRQK  PNBRQK .";
 

+  // Check for reentrancy, as example when called from inside
+  // MovePicker that is used also here in move_to_san()
+  if (RequestPending)
+      return;
+
+  RequestPending = true;
+

   std::cout << std::endl;
   if (m != MOVE_NONE)
   {
   std::cout << std::endl;
   if (m != MOVE_NONE)
   {

-      Position p(*this);

       std::string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");
       std::string col = (color_of_piece_on(move_from(m)) == BLACK ? ".." : "");

-      std::cout << "Move is: " << col << move_to_san(p, m) << std::endl;
+      std::cout << "Move is: " << col << move_to_san(*this, m) << std::endl;

   }
   for (Rank rank = RANK_8; rank >= RANK_1; rank--)
   {
   }
   for (Rank rank = RANK_8; rank >= RANK_1; rank--)
   {


@@ -297,6 +304,8 @@ void Position::print(Move m) const {
   std::cout << "+---+---+---+---+---+---+---+---+" << std::endl
             << "Fen is: " << to_fen() << std::endl
             << "Key is: " << key << std::endl;
   std::cout << "+---+---+---+---+---+---+---+---+" << std::endl
             << "Fen is: " << to_fen() << std::endl
             << "Key is: " << key << std::endl;

+
+  RequestPending = false;

 }
 
 
 }
 
 


@@ -666,10 +675,12 @@ bool Position::move_is_check(Move m, Bitboard dcCandidates) const {
 
 
 /// Position::move_is_capture() tests whether a move from the current
 
 
 /// Position::move_is_capture() tests whether a move from the current

-/// position is a capture.
+/// position is a capture. Move must not be MOVE_NONE.

 
 bool Position::move_is_capture(Move m) const {
 
 
 bool Position::move_is_capture(Move m) const {
 

+  assert(m != MOVE_NONE);
+

   return (   !square_is_empty(move_to(m))
           && (color_of_piece_on(move_to(m)) == opposite_color(side_to_move()))
          )
   return (   !square_is_empty(move_to(m))
           && (color_of_piece_on(move_to(m)) == opposite_color(side_to_move()))
          )