mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

InnoDB bug fix: mem_realloc() didn't preserve the block contents

Browse source 
innobase/include/mem0mem.ic:
  mem_realloc(): preserve the old buffer contents
This commit is contained in:
unknown 2004-06-16 17:22:35 +03:00
parent d587a36aa1
commit a09ecb2504
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
innobase/include/mem0mem.ic
View file

@ -575,9 +575,21 @@ mem_realloc(
char* file_name,/* in: file name where called */
ulint line) /* in: line where called */
{
mem_free(buf);
mem_heap_t* heap = (mem_heap_t*)((byte*)buf
- MEM_BLOCK_HEADER_SIZE - MEM_FIELD_HEADER_SIZE);
ulint size;
ut_a(heap->magic_n == MEM_BLOCK_MAGIC_N);
size = mem_block_get_len(heap);
ut_a(size > MEM_BLOCK_HEADER_SIZE + MEM_FIELD_HEADER_SIZE);
size -= MEM_BLOCK_HEADER_SIZE + MEM_FIELD_HEADER_SIZE;
return(mem_alloc_func(n, file_name, line));
if (n > size) {
void* newbuf = memcpy(mem_alloc_func(n, file_name, line),
buf, size);
mem_free(buf);
buf = newbuf;
}
return(buf);
}
/**************************************************************************