branches/zip: Merge 1894:1918 from trunk.

14b70068 · marko · 202405cc · 14b70068 · 14b70068
Commit 14b70068 authored Sep 28, 2007 by marko
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

include/rem0rec.ic include/rem0rec.ic +1 -0

include/univ.i include/univ.i +4 -0

No files found.
--- a/include/rem0rec.ic
+++ b/include/rem0rec.ic
@@ -895,6 +895,7 @@ rec_offs_set_n_alloc(
 {
 	ut_ad(offsets);
 	ut_ad(n_alloc > 0);
+	UNIV_MEM_ASSERT_AND_ALLOC(offsets, n_alloc * sizeof *offsets);
 	offsets[0] = n_alloc;
 }

--- a/include/univ.i
+++ b/include/univ.i
@@ -358,5 +358,9 @@ typedef void* os_thread_ret_t;
 	UNIV_MEM_ASSERT_W(addr, size);			\
 	UNIV_MEM_FREE(addr, size);			\
 } while (0)
+#define UNIV_MEM_ASSERT_AND_ALLOC(addr, size) do {	\
+	UNIV_MEM_ASSERT_W(addr, size);			\
+	UNIV_MEM_ALLOC(addr, size);			\
+} while (0)
 #endif