Fix an error introduced in the previous commit.

fil_parse_write_crypt_data(): Correct the comparison operator. This was broken in commit 498f4a8 which removed a signed/unsigned mismatch in these comparisons.
MariaDB · Mar 9, 2017 · b28adb6 · b28adb6
1 parent 498f4a8
commit b28adb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc
@@ -473,7 +473,7 @@ fil_parse_write_crypt_data(
 		4 +  // size of key_id
 		1; // fil_encryption_t
 
-	if (ptr + entry_size < end_ptr) {
+	if (ptr + entry_size > end_ptr) {
 		return NULL;
 	}
 
@@ -499,7 +499,7 @@ fil_parse_write_crypt_data(
 	fil_encryption_t encryption = (fil_encryption_t)mach_read_from_1(ptr);
 	ptr +=1;
 
-	if (ptr + len < end_ptr) {
+	if (ptr + len > end_ptr) {
 		return NULL;
 	}
 

diff --git a/storage/xtradb/fil/fil0crypt.cc b/storage/xtradb/fil/fil0crypt.cc
@@ -473,7 +473,7 @@ fil_parse_write_crypt_data(
 		4 +  // size of key_id
 		1; // fil_encryption_t
 
-	if (ptr + entry_size < end_ptr) {
+	if (ptr + entry_size > end_ptr) {
 		return NULL;
 	}
 
@@ -499,7 +499,7 @@ fil_parse_write_crypt_data(
 	fil_encryption_t encryption = (fil_encryption_t)mach_read_from_1(ptr);
 	ptr +=1;
 
-	if (ptr + len < end_ptr) {
+	if (ptr + len > end_ptr) {
 		return NULL;
 	}