From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 25 Jun 2009 18:55:07 +0000 (+0000)
Subject: Merged revisions 203231 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f710b0b128ae925118dee72fa665a04255f258cf;p=thirdparty%2Fasterisk.git

Merged revisions 203231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203231 | mmichelson | 2009-06-25 13:53:12 -0500 (Thu, 25 Jun 2009) | 8 lines

  Blocked revisions 203230 via svnmerge

  ........
    r203230 | mmichelson | 2009-06-25 13:52:22 -0500 (Thu, 25 Jun 2009) | 3 lines

    Prevent false positives when freeing a NULL pointer with MALLOC_DEBUG enabled.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@203233 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/astmm.c b/main/astmm.c
index e72c1e318d..bbcc6b54e8 100644
--- a/main/astmm.c
+++ b/main/astmm.c
@@ -157,10 +157,16 @@ static inline size_t __ast_sizeof_region(void *ptr)
 
 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;
 	unsigned int *fence;
 
+	if (!ptr) {
+		return;
+	}
+
+	hash = HASH(ptr);
+
 	ast_mutex_lock(&reglock);
 	for (reg = regions[hash]; reg; reg = reg->next) {
 		if (reg->data == ptr) {