From 17e942e9b5c296c59c9509b290cf817c66439b3d Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Wed, 16 Sep 2015 21:20:40 +0100
Subject: [PATCH] [475707] Fix free related crash on openwrt.

Thanks to Karl Palsson.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=475707
---
 ChangeLog.txt     | 1 +
 lib/memory_mosq.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index b7f27859..320d4ab6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,7 @@ Broker:
 - Don't leak sockets when outgoing bridge with multiple addresses cannot
   connect. Closes #477571.
 - Fix cross compiling of websockets. Closes #475807.
+- Fix memory free related crashes on openwrt. Closes #475707.
 
 
 1.4.3 - 20150818
diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c
index 1b7e61b3..dd3c50d0 100644
--- a/lib/memory_mosq.c
+++ b/lib/memory_mosq.c
@@ -54,6 +54,9 @@ void *_mosquitto_calloc(size_t nmemb, size_t size)
 void _mosquitto_free(void *mem)
 {
 #ifdef REAL_WITH_MEMORY_TRACKING
+	if(!mem){
+		return;
+	}
 	memcount -= malloc_usable_size(mem);
 #endif
 	free(mem);