Backported child shutdown fix

diff --git a/shib-target/shib-config.cpp b/shib-target/shib-config.cpp
index 3114315..9a0e17a 100644 (file)
--- a/shib-target/shib-config.cpp
+++ b/shib-target/shib-config.cpp
@@ -178,8 +178,10 @@ void STConfig::shutdown()
     Category& log = Category::getInstance("shibtarget.STConfig");
     log.info("shutting down the library");
     delete m_tranLogLock;
+    m_tranLogLock = NULL;
     //delete m_tranLog; // This is crashing for some reason, but we're shutting down anyway.
     delete m_ini;
+    m_ini = NULL;
     ShibConfig::getConfig().term();
     SAMLConfig::getConfig().term();
     log.info("library shutdown complete");

diff --git a/shib-target/shib-rpchandle.cpp b/shib-target/shib-rpchandle.cpp
index 4282787..c71d8e4 100644 (file)
--- a/shib-target/shib-rpchandle.cpp
+++ b/shib-target/shib-rpchandle.cpp
@@ -88,9 +88,13 @@ void RPCHandle::disconnect()
         clnt_destroy(m_clnt);
         m_clnt=NULL;
         IConfig* conf=ShibTargetConfig::getConfig().getINI();
-        Locker locker(conf);
-        conf->getListener()->close(m_sock);
-        m_sock=(IListener::ShibSocket)0;
+        if (conf) {
+            Locker locker(conf);
+            conf->getListener()->close(m_sock);
+            m_sock=(IListener::ShibSocket)0;
+        }
+        else
+            m_sock=(IListener::ShibSocket)0;
     }
 }