branches/zip: page_zip_fields_decode(): Do not dereference a null pointer.

9d9714b8 · marko · e5c3aa12 · 9d9714b8
Commit 9d9714b8 authored Jan 08, 2007 by marko
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

page/page0zip.c page/page0zip.c +3 -5

No files found.
--- a/page/page0zip.c
+++ b/page/page0zip.c
@@ -1267,13 +1267,11 @@ page_zip_fields_decode(

 	/* Decode the position of the trx_id column. */
 	if (trx_id_col) {
-		if (UNIV_UNLIKELY(val >= n)) {
-			page_zip_fields_free(index);
-			index = NULL;
-		}
-
 		if (!val) {
 			val = ULINT_UNDEFINED;
+		} else if (UNIV_UNLIKELY(val >= n)) {
+			page_zip_fields_free(index);
+			index = NULL;
 		} else {
 			index->type = DICT_CLUSTERED;
 		}