From a9b60b05ac596b9db6107daefa8ea35b14f23640 Mon Sep 17 00:00:00 2001 From: balr0g Date: Sat, 2 Jan 2016 11:05:16 -0500 Subject: Add realloc implementation as required by the C standard (nw) --- src/lib/util/corealloc.cpp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'src/lib/util/corealloc.cpp') diff --git a/src/lib/util/corealloc.cpp b/src/lib/util/corealloc.cpp index 38f21846f96..eaf0ff40420 100644 --- a/src/lib/util/corealloc.cpp +++ b/src/lib/util/corealloc.cpp @@ -222,6 +222,44 @@ void free_file_line(void *memory, const char *file, int line, bool array) osd_free(memory); } +void *realloc_internal(void *memory, size_t size, const char *file, int line, bool array) +{ + fprintf(stderr, "realloc_internal called for %p in %s(%d)!\n", memory, file, line); + if(size == 0) { + return nullptr; + } + if(memory == nullptr) { + return malloc_file_line(size, file, line, array, false, false); + } + // find the memory entry + memory_entry *entry = memory_entry::find(memory); + + // warn about untracked reallocs + if (entry == nullptr) + { + fprintf(stderr, "Error: attempt to realloc untracked memory %p in %s(%d)!\n", memory, file, line); + osd_break_into_debugger("Error: attempt to realloc untracked memory"); + return memory; + } + + // this is used internally and should always be an array + if(!array || !entry->m_array) + { + fprintf(stderr, "Error: attempt to realloc non-array memory %p in %s(%d). realloc_internal should never be called directly!\n", memory, file, line); + osd_break_into_debugger("Error: attempt to realloc non-array memory"); + } + + size_t o_size = entry->m_size; + void *new_buf = malloc_file_line(size, file, line, array, false, false); + if(new_buf == nullptr) { + fprintf(stderr, "Error: realloc: unable to allocate new buffer %p in %s(%d)!\n", memory, file, line); + return nullptr; + } + memcpy(new_buf, memory, (o_size < size) ? o_size : size); + free_file_line(memory, file, line, array); + return new_buf; +} + //------------------------------------------------- // track_memory - enables or disables the memory -- cgit v1.2.3