From 757f8a7dc706b83e969309d44bc04dc38785d157 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Fri, 16 Aug 2013 11:41:25 +0200
Subject: [PATCH] Fixed segfault at POP3 connection error.

---
 SConstruct                       |  1 +
 src/net/pop3/POP3Connection.cpp  | 27 ++++++++-----
 tests/net/pop3/POP3StoreTest.cpp | 69 ++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 10 deletions(-)
 create mode 100644 tests/net/pop3/POP3StoreTest.cpp

diff --git a/SConstruct b/SConstruct
index baff95c0..5c6a0657 100644
--- a/SConstruct
+++ b/SConstruct
@@ -416,6 +416,7 @@ libvmimetest_sources = [
 	'tests/net/messageSetTest.cpp',
 	'tests/net/pop3/POP3CommandTest.cpp',
 	'tests/net/pop3/POP3ResponseTest.cpp',
+	'tests/net/pop3/POP3StoreTest.cpp',
 	'tests/net/pop3/POP3UtilsTest.cpp',
 	'tests/net/imap/IMAPTagTest.cpp',
 	'tests/net/imap/IMAPParserTest.cpp',
diff --git a/src/net/pop3/POP3Connection.cpp b/src/net/pop3/POP3Connection.cpp
index 33349749..948242d7 100644
--- a/src/net/pop3/POP3Connection.cpp
+++ b/src/net/pop3/POP3Connection.cpp
@@ -188,18 +188,25 @@ void POP3Connection::disconnect()
 
 void POP3Connection::internalDisconnect()
 {
-	try
+	if (m_socket)
 	{
-		POP3Command::QUIT()->send(thisRef().dynamicCast <POP3Connection>());
-		POP3Response::readResponse(thisRef().dynamicCast <POP3Connection>());
-	}
-	catch (exception&)
-	{
-		// Not important
-	}
+		if (m_socket->isConnected())
+		{
+			try
+			{
+				POP3Command::QUIT()->send(thisRef().dynamicCast <POP3Connection>());
+				POP3Response::readResponse(thisRef().dynamicCast <POP3Connection>());
+			}
+			catch (exception&)
+			{
+				// Not important
+			}
 
-	m_socket->disconnect();
-	m_socket = NULL;
+			m_socket->disconnect();
+		}
+
+		m_socket = NULL;
+	}
 
 	m_timeoutHandler = NULL;
 
diff --git a/tests/net/pop3/POP3StoreTest.cpp b/tests/net/pop3/POP3StoreTest.cpp
new file mode 100644
index 00000000..d938f472
--- /dev/null
+++ b/tests/net/pop3/POP3StoreTest.cpp
@@ -0,0 +1,69 @@
+//
+// VMime library (http://www.vmime.org)
+// Copyright (C) 2002-2013 Vincent Richard <vincent@vmime.org>
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License as
+// published by the Free Software Foundation; either version 3 of
+// the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Linking this library statically or dynamically with other modules is making
+// a combined work based on this library.  Thus, the terms and conditions of
+// the GNU General Public License cover the whole combination.
+//
+
+#include "tests/testUtils.hpp"
+
+#include "tests/net/pop3/POP3TestUtils.hpp"
+
+#include "vmime/net/pop3/POP3Store.hpp"
+#include "vmime/net/pop3/POP3SStore.hpp"
+
+
+VMIME_TEST_SUITE_BEGIN(POP3StoreTest)
+
+	VMIME_TEST_LIST_BEGIN
+		VMIME_TEST(testCreateFromURL)
+		VMIME_TEST(testConnectToInvalidServer)
+	VMIME_TEST_LIST_END
+
+
+	void testCreateFromURL()
+	{
+		vmime::ref <vmime::net::session> sess
+			= vmime::create <vmime::net::session>();
+
+		// POP3
+		vmime::utility::url url("pop3://pop3.vmime.org");
+		vmime::ref <vmime::net::store> store = sess->getStore(url);
+
+		VASSERT_TRUE("pop3", typeid(*store) == typeid(vmime::net::pop3::POP3Store));
+
+		// POP3S
+		vmime::utility::url url2("pop3s://pop3s.vmime.org");
+		vmime::ref <vmime::net::store> store2 = sess->getStore(url2);
+
+		VASSERT_TRUE("pop3s", typeid(*store2) == typeid(vmime::net::pop3::POP3SStore));
+	}
+
+	void testConnectToInvalidServer()
+	{
+		vmime::ref <vmime::net::session> sess
+			= vmime::create <vmime::net::session>();
+
+		vmime::utility::url url("pop3://invalid-pop3-server");
+		vmime::ref <vmime::net::store> store = sess->getStore(url);
+
+		VASSERT_THROW("connect", store->connect(), vmime::exceptions::connection_error);
+	}
+
+VMIME_TEST_SUITE_END