Fix reading of book file

[stockfish] / src / book.cpp

diff --git a/src/book.cpp b/src/book.cpp
index d6dcf6cb3c8bd84798c5551ef92396f0b051c901..26fd7c92faa930518315c46222ad31c08d326ec0 100644 (file)
--- a/src/book.cpp
+++ b/src/book.cpp
@@ -459,7 +459,7 @@ Move Book::get_move(const Position& pos, bool findBestMove) {
                  move_to(Move(bookMove)), PieceType(p + 1)));
 
   // Verify the book move (if any) is legal
-  MoveStack mlist[MOVES_MAX];
+  MoveStack mlist[MAX_MOVES];
   MoveStack* last = generate<MV_LEGAL>(pos, mlist);
   for (MoveStack* cur = mlist; cur != last; cur++)
       if ((int(cur->move) & ~(3 << 14)) == bookMove) // Mask out special flags
@@ -502,19 +502,34 @@ int Book::find_entry(uint64_t key) {
 }
 
 
+/// Book::get_number() reads sizeof(T) chars from the file's binary byte
+/// stream and converts them in a number of type T.
+template<typename T>
+void Book::get_number(T& n) {
+
+  n = 0;
+
+  for (size_t i = 0; i < sizeof(T); i++)
+      n = (n << 8) + (T)bookFile.get();
+}
+
+
 /// Book::read_entry() takes an integer index, and returns the BookEntry
 /// at the given index in the book file.
 
 BookEntry Book::read_entry(int idx) {
 
   assert(idx >= 0 && idx < bookSize);
-  assert(is_open());
+  assert(bookFile.is_open());
 
   BookEntry e;
 
   bookFile.seekg(idx * sizeof(BookEntry), ios_base::beg);
 
-  *this >> e.key >> e.move >> e.count >> e.learn;
+  get_number(e.key);
+  get_number(e.move);
+  get_number(e.count);
+  get_number(e.learn);
 
   if (!bookFile.good())
   {