From 8617c82ec22c8e991ad3e3936577ffee00df14da Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 19 Nov 2016 20:54:40 +0900 Subject: [PATCH] Floor disk_count at zero. --- server/block_processor.py | 2 +- server/db.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/block_processor.py b/server/block_processor.py index 9373bc9..1765878 100644 --- a/server/block_processor.py +++ b/server/block_processor.py @@ -828,7 +828,7 @@ class BlockProcessor(server.db.DB): def read_headers(self, start, count): # Read some from disk - disk_count = min(count, self.fs_height + 1 - start) + disk_count = min(count, max(0, self.fs_height + 1 - start)) result = self.fs_read_headers(start, disk_count) count -= disk_count start += disk_count diff --git a/server/db.py b/server/db.py index c1b3ff9..aa5e129 100644 --- a/server/db.py +++ b/server/db.py @@ -143,6 +143,7 @@ class DB(LoggedClass): raise def fs_read_headers(self, start, count): + '''Requires count >= 0.''' # Read some from disk disk_count = min(count, self.db_height + 1 - start) if start < 0 or count < 0 or disk_count != count: