From afeec303bd4e02185ba40990df0e9a31b27649b4 Mon Sep 17 00:00:00 2001
From: marko <>
Date: Tue, 2 Jan 2007 21:25:40 +0000
Subject: [PATCH] branches/zip: buf_page_get_gen(): When checking a guessed
 block, also check buf_page_in_file().  This error was introduced in r1082.

---
 buf/buf0buf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/buf/buf0buf.c b/buf/buf0buf.c
index 99916db2e3b..3191169593c 100644
--- a/buf/buf0buf.c
+++ b/buf/buf0buf.c
@@ -1505,9 +1505,10 @@ loop:
 		block = guess;
 
 		if (offset != block->page.offset
-		    || space != block->page.space) {
+		    || space != block->page.space
+		    || !buf_page_in_file(&block->page)) {
 
-			block = NULL;
+			block = guess = NULL;
 		}
 	}