From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 31 Aug 2014 19:04:03 +0000 (+0200)
Subject: fix possible fd leak in signpipe worker
X-Git-Tag: auth-3.4.0-rc2~28^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1687%2Fhead;p=thirdparty%2Fpdns.git

fix possible fd leak in signpipe worker
---

diff --git a/pdns/signingpipe.cc b/pdns/signingpipe.cc
index bb164e3405..0756149f38 100644
--- a/pdns/signingpipe.cc
+++ b/pdns/signingpipe.cc
@@ -62,11 +62,8 @@ try
   shs.d_csp->worker(shs.d_id, shs.d_fd);
   return 0;
 }
-catch(PDNSException& pe) {
-  L<<Logger::Error<<"Signing thread died with error "<<pe.reason<<endl;
-}
-catch(std::exception& e) {
-  L<<Logger::Error<<"Signing thread died with error "<<e.what()<<endl;
+catch(...) {
+  L<<Logger::Error<<"unknown exception in signing thread occurred"<<endl;
   return 0;
 }
 
@@ -303,6 +300,11 @@ try
   }
   close(fd);
 }
+catch(PDNSException& pe)
+{
+  L<<Logger::Error<<"Signing thread died because of PDNSException: "<<pe.reason<<endl;
+  close(fd);
+}
 catch(std::exception& e)
 {
   L<<Logger::Error<<"Signing thread died because of std::exception: "<<e.what()<<endl;