From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 29 Apr 2014 19:37:03 +0000 (-0700)
Subject: Resolve 'dying from an unhandled exception: c'
X-Git-Tag: SQUID_3_5_0_1~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca603620581f25a116036633f9f7b693ed763a52;p=thirdparty%2Fsquid.git

Resolve 'dying from an unhandled exception: c'

CbcPointer<> is used from code outside of Job protection where it is
safe to use Must(). In order to get a useful backtrace we need to assert
immediately at the point of failure. Particularly necessary since these
are in generic operators used "everywhere" in the code.
---

diff --git a/src/base/CbcPointer.h b/src/base/CbcPointer.h
index 51c86b125e..3bed8db2aa 100644
--- a/src/base/CbcPointer.h
+++ b/src/base/CbcPointer.h
@@ -135,7 +135,7 @@ Cbc &
 CbcPointer<Cbc>::operator *() const
 {
     Cbc *c = get();
-    Must(c);
+    assert(c);
     return *c;
 }
 
@@ -144,7 +144,7 @@ Cbc *
 CbcPointer<Cbc>::operator ->() const
 {
     Cbc *c = get();
-    Must(c);
+    assert(c);
     return c;
 }