------------------------------------------------------------
revno: 13932
revision-id: squid3@treenet.co.nz-20151001110125-9ucn63rn9azye9rr
parent: squid3@treenet.co.nz-20151001104613-0evw0t1ex6f09pi9
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2015-10-01 04:01:25 -0700
message:
  Align behavior of MEMPROXY_CLASS's operator delete with ::delete on nullptr
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20151001110125-9ucn63rn9azye9rr
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 2119cbe7d16ad93dd50590f1f8b9117e6f059afb
# timestamp: 2015-10-01 11:09:02 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20151001104613-\
#   0evw0t1ex6f09pi9
# 
# Begin patch
=== modified file 'include/MemPool.h'
--- include/MemPool.h	2015-01-13 09:13:49 +0000
+++ include/MemPool.h	2015-10-01 11:01:25 +0000
@@ -319,7 +319,8 @@
 void \
 CLASS::operator delete (void *address) \
 { \
-    Pool().freeOne(address); \
+    if (address) \
+        Pool().freeOne(address); \
 }
 
 /// \ingroup MemPoolsAPI