mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: page_zip_decompress(): Initialize page_zip->n_blobs before

Browse source 
referencing it, to prevent a ut_ad() assertion on page_zip_get_trailer_len()
from failing.  Promote that assertion to ut_a().
This commit is contained in:
marko 2006-08-21 09:08:47 +00:00
parent 7291e6579e
commit 3ce5d06e66
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
page/page0zip.c
View file

@ -1860,6 +1860,7 @@ zlib_done:
/* The dense directory excludes the infimum and supremum records. */
n_dense = page_dir_get_n_heap(page) - 2;
page_zip->n_blobs = 0;
page_zip->m_start = PAGE_DATA + d_stream.total_in;
/* Apply the modification log. */
@ -1874,7 +1875,7 @@ zlib_done:
goto err_exit;
}
page_zip->m_end = mod_log_ptr - page_zip->data;
ut_ad(page_zip_get_trailer_len(page_zip, index, NULL)
ut_a(page_zip_get_trailer_len(page_zip, index, NULL)
+ page_zip->m_end < page_zip->size);
}
@ -1888,7 +1889,6 @@ err_exit:
/* Copy the uncompressed fields. */
page_zip->n_blobs = 0;
storage = page_zip->data + page_zip->size
- n_dense * PAGE_ZIP_DIR_SLOT_SIZE;