branches/zip: Merge 1894:1918 from trunk.

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;
 }
 

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