fil0fil.c:

  Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message

1 files changed, 7 insertions, 7 deletions

diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index a8da074cab9..16ae8e6e228 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -3800,13 +3800,6 @@ fil_io(
 	node = UT_LIST_GET_FIRST(space->chain);
 
 	for (;;) {
-		if (space->id != 0 && node->size == 0) {
-			/* We do not know the size of a single-table tablespace
-			before we open the file */
-
-			break;
-		}
-
 		if (node == NULL) {
 			fprintf(stderr,
 	"InnoDB: Error: trying to access page number %lu in space %lu,\n"
@@ -3820,6 +3813,13 @@ fil_io(
 			ut_error;
 		}
 
+		if (space->id != 0 && node->size == 0) {
+			/* We do not know the size of a single-table tablespace
+			before we open the file */
+
+			break;
+		}
+
 		if (node->size > block_offset) {
 			/* Found! */
 			break;