From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Sat, 21 Sep 2019 22:45:03 +0000 (+0000)
Subject: Fix URN response exception handling (#479)
X-Git-Tag: SQUID_5_0_1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd10977c21849a00a79f577485bc53871201214c;p=thirdparty%2Fsquid.git

Fix URN response exception handling (#479)

CID 1453857: Error handling issues (UNCAUGHT_EXCEPT)

Due to various Store deficiencies, storeUnregister() might call swapout
code which Broadcast()s and throws Ipc::OneToOneUniQueue::ItemTooLarge.
---

diff --git a/src/urn.cc b/src/urn.cc
index efadc88151..a6a2823eb3 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -11,6 +11,7 @@
 #include "squid.h"
 #include "AccessLogEntry.h"
 #include "acl/FilledChecklist.h"
+#include "base/TextException.h"
 #include "cbdata.h"
 #include "errorpage.h"
 #include "FwdState.h"
@@ -78,16 +79,18 @@ CBDATA_CLASS_INIT(UrnState);
 
 UrnState::~UrnState()
 {
-    if (urlres_e) {
-        if (sc)
-            storeUnregister(sc, urlres_e, this);
-        urlres_e->unlock("~UrnState+res");
-    }
+    SWALLOW_EXCEPTIONS({
+        if (urlres_e) {
+            if (sc)
+                storeUnregister(sc, urlres_e, this);
+            urlres_e->unlock("~UrnState+res");
+        }
 
-    if (entry)
-        entry->unlock("~UrnState+prime");
+        if (entry)
+            entry->unlock("~UrnState+prime");
 
-    safe_free(urlres);
+        safe_free(urlres);
+    });
 }
 
 static url_entry *