3 files changed, 66 insertions, 20 deletions
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 5f657a4..3dff06f 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -55,21 +55,27 @@ boost::shared_ptr<VCard> VCardFileStorage::getVCard(const JID& jid) const {
 	return VCardPersister().loadPayloadGeneric(getVCardPath(jid));
 }
 
 void VCardFileStorage::setVCard(const JID& jid, VCard::ref v) {
 	VCardPersister().savePayload(v, getVCardPath(jid));
 	getAndUpdatePhotoHash(jid, v);
 }
 
 boost::filesystem::path VCardFileStorage::getVCardPath(const JID& jid) const {
-	std::string file(jid.toString());
-	String::replaceAll(file, '/', "%2f");
-	return boost::filesystem::path(vcardsPath / (file + ".xml"));
+	try {
+		std::string file(jid.toString());
+		String::replaceAll(file, '/', "%2f");
+		return boost::filesystem::path(vcardsPath / (file + ".xml"));
+	}
+	catch (const boost::filesystem::filesystem_error& e) {
+		std::cerr << "ERROR: " << e.what() << std::endl;
+		return boost::filesystem::path();
+	}
 }
 
 std::string VCardFileStorage::getPhotoHash(const JID& jid) const {
 	PhotoHashMap::const_iterator i = photoHashes.find(jid);
 	if (i != photoHashes.end()) {
 		return i->second;
 	}
 	else {
 		VCard::ref vCard = getVCard(jid);
diff --git a/Swiften/Entity/PayloadPersister.cpp b/Swiften/Entity/PayloadPersister.cpp
index 955135b..729d36a 100644
--- a/Swiften/Entity/PayloadPersister.cpp
+++ b/Swiften/Entity/PayloadPersister.cpp
@@ -19,35 +19,38 @@
 using namespace Swift;
 
 PayloadPersister::PayloadPersister() {
 }
 
 PayloadPersister::~PayloadPersister() {
 }
 
 void PayloadPersister::savePayload(boost::shared_ptr<Payload> payload, const boost::filesystem::path& path) {
-	if (!boost::filesystem::exists(path.parent_path())) {
-		try {
+	try {
+		if (!boost::filesystem::exists(path.parent_path())) {
 			boost::filesystem::create_directories(path.parent_path());
 		}
-		catch (const boost::filesystem::filesystem_error& e) {
-			std::cerr << "ERROR: " << e.what() << std::endl;
-		}
+		boost::filesystem::ofstream file(path);
+		file << getSerializer()->serialize(payload);
+		file.close();
+	}
+	catch (const boost::filesystem::filesystem_error& e) {
+		std::cerr << "ERROR: " << e.what() << std::endl;
 	}
-	boost::filesystem::ofstream file(path);
-	file << getSerializer()->serialize(payload);
-	file.close();
 }
 
 boost::shared_ptr<Payload> PayloadPersister::loadPayload(const boost::filesystem::path& path) {
-	if (boost::filesystem::exists(path)) {
-		ByteArray data;
-		readByteArrayFromFile(data, path.string());
-		boost::shared_ptr<PayloadParser> parser(createParser());
-		PayloadParserTester tester(parser.get());
-		tester.parse(byteArrayToString(data));
-		return parser->getPayload();
+	try {
+		if (boost::filesystem::exists(path)) {
+			ByteArray data;
+			readByteArrayFromFile(data, path.string());
+			boost::shared_ptr<PayloadParser> parser(createParser());
+			PayloadParserTester tester(parser.get());
+			tester.parse(byteArrayToString(data));
+			return parser->getPayload();
+		}
 	}
-	else {
-		return boost::shared_ptr<Payload>();
+	catch (const boost::filesystem::filesystem_error& e) {
+		std::cerr << "ERROR: " << e.what() << std::endl;
 	}
+	return boost::shared_ptr<Payload>();
 }
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 45a04ba..7667176 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -1,31 +1,36 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 #include <boost/algorithm/string.hpp>
+#include <sstream>
 
 #include <Swiften/VCards/VCardFileStorage.h>
 #include <Swiften/JID/JID.h>
 #include "SwifTools/Application/PlatformApplicationPathProvider.h"
 #include <Swiften/Elements/VCard.h>
 
 using namespace Swift;
 
 class VCardFileStorageTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(VCardFileStorageTest);
 		CPPUNIT_TEST(testSetVCard);
+		// Temporarily disabling this, because it generates error messages on console. Need to figure
+		// out something for not showing error messages during tests.
+		//CPPUNIT_TEST(testSetVCard_LargeFilename);
 		CPPUNIT_TEST(testGetVCard);
 		CPPUNIT_TEST(testGetVCard_FileDoesNotExist);
+		//CPPUNIT_TEST(testGetVCard_LargeFilename);
 		CPPUNIT_TEST_SUITE_END();
 
 	public:
 		void setUp() {
 			pathProvider = new PlatformApplicationPathProvider("VCardStorageTest");
 			vcardsPath = pathProvider->getExecutableDir() / "vcards";
 			boost::filesystem::remove_all(vcardsPath);
 		}
 
@@ -42,28 +47,60 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
 			testling->setVCard(JID("alice@wonderland.lit/TeaRoom"), vcard);
 
 			boost::filesystem::path vcardFile(vcardsPath / "alice@wonderland.lit%2fTeaRoom.xml");
 			CPPUNIT_ASSERT(boost::filesystem::exists(vcardFile));
 			ByteArray data;
 			data.readFromFile(vcardFile.string());
 			CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">"));
 		}
 
+		void testSetVCard_LargeFilename() {
+			std::auto_ptr<VCardFileStorage> testling(createTestling());
+			VCard::ref vcard(new VCard());
+			vcard->setFullName("Alice In Wonderland");
+
+			std::ostringstream s;
+			for (int i = 0; i < 1000; ++i) {
+				s << "_";
+			}
+
+			JID jid("alice@wonderland.lit/" + s.str());
+			testling->setVCard(jid, vcard);
+
+			// Just check whether we don't crash
+		}
+
 		void testGetVCard() {
 			boost::shared_ptr<VCardFileStorage> testling(createTestling());
 			VCard::ref vcard(new VCard());
 			vcard->setFullName("Alice In Wonderland");
 			testling->setVCard(JID("alice@wonderland.lit"), vcard);
 
 			VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
 			CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), result->getFullName());
 		}
 
+		void testGetVCard_LargeFilename() {
+			std::auto_ptr<VCardFileStorage> testling(createTestling());
+			VCard::ref vcard(new VCard());
+			vcard->setFullName("Alice In Wonderland");
+
+			std::ostringstream s;
+			for (int i = 0; i < 1000; ++i) {
+				s << "_";
+			}
+			JID jid("alice@wonderland.lit/" + s.str());
+
+			VCard::ref result = testling->getVCard(jid);
+
+			// Just check that we don't have an exception
+		}
+
 		void testGetVCard_FileDoesNotExist() {
 			boost::shared_ptr<VCardFileStorage> testling(createTestling());
 			VCard::ref result = testling->getVCard(JID("alice@wonderland.lit"));
 			CPPUNIT_ASSERT(!result);
 		}
 
 	private:
 		VCardFileStorage* createTestling() {
 			return new VCardFileStorage(vcardsPath);