From eb883b30a5182d85d750de7da2ef56a5fedca291 Mon Sep 17 00:00:00 2001
From: "heikki@donna.mysql.fi" <>
Date: Tue, 4 Dec 2001 16:01:30 +0200
Subject: log0recv.c:   Add fault tolerance: when a log record contains
 nonsensical space id or page number, stop log scan there

---
 innobase/log/log0recv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'innobase')

diff --git a/innobase/log/log0recv.c b/innobase/log/log0recv.c
index 999429cbfcd..1734cfadfff 100644
--- a/innobase/log/log0recv.c
+++ b/innobase/log/log0recv.c
@@ -1316,7 +1316,9 @@ recv_parse_log_rec(
 
 	new_ptr = mlog_parse_initial_log_record(ptr, end_ptr, type, space,
 								page_no);
-	if (!new_ptr) {
+	/* Check that space id and page_no are sensible */
+
+	if (!new_ptr || *space != 0 || *page_no > 0x8FFFFFFF) {
 
 		return(0);
 	}
-- 
cgit v1.2.1


From 8aa82356bfcb8c493453067e481a02777566a5aa Mon Sep 17 00:00:00 2001
From: "heikki@donna.mysql.fi" <>
Date: Tue, 4 Dec 2001 17:03:24 +0200
Subject: buf0buf.ic, mtr0log.ic:   Add diagnostic code to catch possible space
 id or page no errors in the log

---
 innobase/include/buf0buf.ic | 10 ++++++++--
 innobase/include/mtr0log.ic |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'innobase')

diff --git a/innobase/include/buf0buf.ic b/innobase/include/buf0buf.ic
index 3d88d087e63..8f5443ad150 100644
--- a/innobase/include/buf0buf.ic
+++ b/innobase/include/buf0buf.ic
@@ -211,6 +211,9 @@ buf_block_align(
 
 	block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero)
 						>> UNIV_PAGE_SIZE_SHIFT);
+	ut_a(block >= buf_pool->blocks);
+	ut_a(block < buf_pool->blocks + buf_pool->max_size);
+
 	return(block);
 }	
 
@@ -235,6 +238,9 @@ buf_block_align_low(
 
 	block = buf_pool_get_nth_block(buf_pool, (ptr - frame_zero)
 						>> UNIV_PAGE_SIZE_SHIFT);
+	ut_a(block >= buf_pool->blocks);
+	ut_a(block < buf_pool->blocks + buf_pool->max_size);
+
 	return(block);
 }	
 
@@ -253,9 +259,9 @@ buf_frame_align(
 
 	frame = ut_align_down(ptr, UNIV_PAGE_SIZE);
 
-	ut_ad((ulint)frame
+	ut_a((ulint)frame
 		>= (ulint)(buf_pool_get_nth_block(buf_pool, 0)->frame));
-	ut_ad((ulint)frame <= (ulint)(buf_pool_get_nth_block(buf_pool,
+	ut_a((ulint)frame <= (ulint)(buf_pool_get_nth_block(buf_pool,
 					buf_pool->max_size - 1)->frame));
 	return(frame);
 }
diff --git a/innobase/include/mtr0log.ic b/innobase/include/mtr0log.ic
index c2150660794..0598f1a9536 100644
--- a/innobase/include/mtr0log.ic
+++ b/innobase/include/mtr0log.ic
@@ -163,6 +163,13 @@ mlog_write_initial_log_record_fast(
 	space = buf_block_get_space(block);
 	offset = buf_block_get_page_no(block);
 
+	if (space != 0 || offset > 0x8FFFFFFF) {
+	        fprintf(stderr,
+	"InnoDB: error: buffer page pointer %lx has nonsensical space id %lu\n"
+	"InnoDB: or page no %lu\n", (ulint)ptr, space, offset);
+	        ut_a(0);
+	}
+
 	mach_write_to_1(log_ptr, type);
 	log_ptr++;	
 	log_ptr += mach_write_compressed(log_ptr, space);
-- 
cgit v1.2.1