upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 23:10:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix two realloc issues.

Browse Source 
realloc(*ptr, 0) now frees the pointer instead of looking at the current
size of the pointer.

if the malloc fails realloc should return NULL;
This commit is contained in:
Mark de Wever 2008-12-05 19:51:59 +00:00
parent 2f76ada0c0
commit 334e1e535b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/poolalloc.c
View File

@ -357,13 +357,17 @@ void* valloc(size_t size)
void* realloc(void* ptr, size_t size)
{
if(IS_OUR_PTR(ptr)) {
const int old_size = get_block_from_chunk(ptr)->header.chunk_size;
if(old_size == 0) {
if(size == 0) {
free(ptr);
return NULL;
}
void* new_memory = malloc(size);
if(new_memory == NULL) {
return NULL;
}
const int old_size = get_block_from_chunk(ptr)->header.chunk_size;
const size_t nbytes = size < old_size ? size : old_size;
memcpy(new_memory, ptr, nbytes);
free(ptr);