From d3ddb9b69dd1692d361b263d73674eb70f12a525 Mon Sep 17 00:00:00 2001
From: uu1101 <uu1101@gmail.com>
Date: Sat, 15 Feb 2014 14:57:33 +0100
Subject: [PATCH] The Listener of a RealListener is never NULL

---
 include/znc/Listener.h | 4 ++--
 src/Listener.cpp       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/znc/Listener.h b/include/znc/Listener.h
index 06aaca58..224cecb4 100644
--- a/include/znc/Listener.h
+++ b/include/znc/Listener.h
@@ -71,7 +71,7 @@ protected:
 
 class CRealListener : public CZNCSock {
 public:
-	CRealListener(CListener *pParent) : CZNCSock(), m_pParent(pParent) {}
+	CRealListener(CListener& listener) : CZNCSock(), m_Listener(listener) {}
 	virtual ~CRealListener();
 
 	virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort);
@@ -79,7 +79,7 @@ public:
 	virtual void SockError(int iErrno, const CString& sDescription);
 
 private:
-	CListener* m_pParent;
+	CListener& m_Listener;
 };
 
 class CIncomingConnection : public CZNCSock {
diff --git a/src/Listener.cpp b/src/Listener.cpp
index 4fddeba8..9950cd2d 100644
--- a/src/Listener.cpp
+++ b/src/Listener.cpp
@@ -27,7 +27,7 @@ bool CListener::Listen() {
 		return false;
 	}
 
-	m_pListener = new CRealListener(this);
+	m_pListener = new CRealListener(*this);
 
 	bool bSSL = false;
 #ifdef HAVE_LIBSSL
@@ -50,7 +50,7 @@ void CListener::ResetRealListener() {
 }
 
 CRealListener::~CRealListener() {
-	m_pParent->ResetRealListener();
+	m_Listener.ResetRealListener();
 }
 
 bool CRealListener::ConnectionFrom(const CString& sHost, unsigned short uPort) {
@@ -60,7 +60,7 @@ bool CRealListener::ConnectionFrom(const CString& sHost, unsigned short uPort) {
 }
 
 Csock* CRealListener::GetSockObj(const CString& sHost, unsigned short uPort) {
-	CIncomingConnection *pClient = new CIncomingConnection(sHost, uPort, m_pParent->GetAcceptType());
+	CIncomingConnection *pClient = new CIncomingConnection(sHost, uPort, m_Listener.GetAcceptType());
 	if (CZNC::Get().AllowConnectionFrom(sHost)) {
 		GLOBALMODULECALL(OnClientConnect(pClient, sHost, uPort), NOTHING);
 	} else {