Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/IDN/LibIDNConverter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/IDN/LibIDNConverter.cpp')
-rw-r--r--Swiften/IDN/LibIDNConverter.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Swiften/IDN/LibIDNConverter.cpp b/Swiften/IDN/LibIDNConverter.cpp
index 0c01352..2325015 100644
--- a/Swiften/IDN/LibIDNConverter.cpp
+++ b/Swiften/IDN/LibIDNConverter.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2012-2016 Isode Limited. 2 * Copyright (c) 2012-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -24,7 +24,7 @@ extern "C" {
24using namespace Swift; 24using namespace Swift;
25 25
26namespace { 26namespace {
27 static const int MAX_STRINGPREP_SIZE = 1024; 27 static const size_t MAX_STRINGPREP_SIZE = 1024;
28 28
29 const Stringprep_profile* getLibIDNProfile(IDNConverter::StringPrepProfile profile) { 29 const Stringprep_profile* getLibIDNProfile(IDNConverter::StringPrepProfile profile) {
30 switch(profile) { 30 switch(profile) {
@@ -44,7 +44,8 @@ namespace {
44 return ContainerType(); 44 return ContainerType();
45 } 45 }
46 46
47 input.resize(MAX_STRINGPREP_SIZE); 47 // Ensure we have enough space for stringprepping, and that input is always NUL terminated
48 input.resize(std::max(MAX_STRINGPREP_SIZE, input.size() + 1));
48 if (stringprep(&input[0], MAX_STRINGPREP_SIZE, static_cast<Stringprep_profile_flags>(0), getLibIDNProfile(profile)) == 0) { 49 if (stringprep(&input[0], MAX_STRINGPREP_SIZE, static_cast<Stringprep_profile_flags>(0), getLibIDNProfile(profile)) == 0) {
49 return input; 50 return input;
50 } 51 }