2 files changed, 6 insertions, 10 deletions
diff --git a/Swiften/IDN/ICUConverter.cpp b/Swiften/IDN/ICUConverter.cpp
index d6b0827..37ce708 100644
--- a/Swiften/IDN/ICUConverter.cpp
+++ b/Swiften/IDN/ICUConverter.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/IDN/ICUConverter.h>
 
@@ -16,12 +16,14 @@
  #include <boost/numeric/conversion/cast.hpp>
 
 using namespace Swift;
 using boost::numeric_cast;
 
 namespace {
+    static constexpr auto maxStringPrepLength = 1023;
+
     typedef std::vector<UChar, SafeAllocator<UChar> > ICUString;
 
     const char* toConstCharArray(const std::string& input) {
         return input.c_str();
     }
 
@@ -90,21 +92,14 @@ namespace {
         std::shared_ptr<UStringPrepProfile> icuProfile(usprep_openByType(getICUProfileType(profile), &status), usprep_close);
         assert(U_SUCCESS(status));
 
         ICUString icuInput = convertToICUString(s);
         ICUString icuResult;
         UParseError parseError;
-        icuResult.resize(icuInput.size());
+        icuResult.resize(maxStringPrepLength);
         int32_t icuResultLength = usprep_prepare(icuProfile.get(), vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), USPREP_ALLOW_UNASSIGNED, &parseError, &status);
-        icuResult.resize(numeric_cast<size_t>(icuResultLength));
-        if (status == U_BUFFER_OVERFLOW_ERROR) {
-            status = U_ZERO_ERROR;
-            icuResult.resize(numeric_cast<size_t>(icuResultLength));
-            icuResultLength = usprep_prepare(icuProfile.get(), vecptr(icuInput), numeric_cast<int32_t>(icuInput.size()), vecptr(icuResult), numeric_cast<int32_t>(icuResult.size()), USPREP_ALLOW_UNASSIGNED, &parseError, &status);
-            icuResult.resize(numeric_cast<size_t>(icuResultLength));
-        }
         if (U_FAILURE(status)) {
             return std::vector<char, SafeAllocator<char> >();
         }
         icuResult.resize(numeric_cast<size_t>(icuResultLength));
 
         return convertToArray(icuResult);
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index b8360ec..46107a0 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -7,13 +7,14 @@ if env["TEST"] :
     myenv.MergeFlags(myenv["CHECKER_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTOOLS_FLAGS"])
     myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
     myenv.MergeFlags(myenv["CPPUNIT_FLAGS"])
     myenv.MergeFlags(myenv["GOOGLETEST_FLAGS"])
     myenv.MergeFlags(myenv["BOOST_FLAGS"])
-    myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
+    myenv.MergeFlags(myenv.get("LIBIDN_FLAGS", {}))
+    myenv.MergeFlags(myenv.get("ICU_FLAGS", {}))
     myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
     myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
     myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
 
     tester = myenv.Program("StorageTest", [
             #"VCardFileStorageTest.cpp",