If attempting to free a NULL pointer when MALLOC_DEBUG
is set, don't bother searching for a region to free, just immediately exit. This has the dual benefit of suppressing a warning message about freeing memory at (nil) and of optimizing the free() replacement by not having to do any futile searching for the proper region to free. (closes issue #13498) Reported by: pj Patches: 13498.patch uploaded by putnopvut (license 60) Tested by: pj git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
224980b07b
commit
48ffe6e772
|
@ -156,10 +156,15 @@ static inline size_t __ast_sizeof_region(void *ptr)
|
||||||
|
|
||||||
static void __ast_free_region(void *ptr, const char *file, int lineno, const char *func)
|
static void __ast_free_region(void *ptr, const char *file, int lineno, const char *func)
|
||||||
{
|
{
|
||||||
int hash = HASH(ptr);
|
int hash;
|
||||||
struct ast_region *reg, *prev = NULL;
|
struct ast_region *reg, *prev = NULL;
|
||||||
unsigned int *fence;
|
unsigned int *fence;
|
||||||
|
|
||||||
|
if (!ptr)
|
||||||
|
return;
|
||||||
|
|
||||||
|
hash = HASH(ptr);
|
||||||
|
|
||||||
ast_mutex_lock(®lock);
|
ast_mutex_lock(®lock);
|
||||||
for (reg = regions[hash]; reg; reg = reg->next) {
|
for (reg = regions[hash]; reg; reg = reg->next) {
|
||||||
if (reg->data == ptr) {
|
if (reg->data == ptr) {
|
||||||
|
|
Loading…
Reference in New Issue