From 77b328ad15843b20f97d7b71e0ff98d2fa14f810 Mon Sep 17 00:00:00 2001
From: Daniel Adolfsson <daniel.adolfsson@tuhox.com>
Date: Wed, 14 Sep 2011 10:51:25 +0200
Subject: [PATCH] Fix ptr<> nested release()

Fix a bug with ptr<> that at some occasions will try to free _ref
multiple times when release() becomes nested.
---
 src/ptr.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/ptr.h b/src/ptr.h
index f700c6d..3adf044 100644
--- a/src/ptr.h
+++ b/src/ptr.h
@@ -49,8 +49,6 @@ private:
          _ref->ns = 1;
          _ref->nw = 0;
          _weak    = false;
-
-         // DBG("acquire(T*) p=%x, count=%d", p, 1);
       }
    }
 
@@ -68,8 +66,6 @@ private:
             _ref->nw++;
          else
             _ref->ns++;
-
-         // DBG("acquire(const ptr<T>&) p=%x, count=%d", _ref->p, _ref->count);
       }
    }
 
@@ -78,17 +74,18 @@ private:
       if(!_ref)
          return;
 
-      if(!_weak && _ref->ns)
+      if(_weak)
+         _ref->nw--;
+      else if(_ref->ns)
       {
-         if(!--_ref->ns && _ref->p)
+         if((_ref->ns == 1) && _ref->p)
          {
             delete _ref->p;
             _ref->p = 0;
          }
-      }
 
-      if(_weak)
-         _ref->nw--;
+         _ref->ns--;
+      }
 
       if(!_ref->ns && !_ref->nw)
          delete _ref;