diff options
author | Simon Warta <[email protected]> | 2015-08-11 07:42:09 +0200 |
---|---|---|
committer | Simon Warta <[email protected]> | 2015-08-11 07:42:09 +0200 |
commit | 765f445f3cef73f5bd6647eab1b99c39a7ad24cb (patch) | |
tree | 62cddee633a8225f813a3422ccb79492d9134cf7 /src/lib/utils/parsing.cpp | |
parent | 480999c2820b0da995108d7474a74755cafd2924 (diff) | |
parent | 170cd1c2b92de39cd6a5f6adae56b470f0bf3898 (diff) |
Merge pull request #243 from webmaster128/avoid-uint32-overflow
Avoid integer overlow in string->uint32 converter
Diffstat (limited to 'src/lib/utils/parsing.cpp')
-rw-r--r-- | src/lib/utils/parsing.cpp | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/lib/utils/parsing.cpp b/src/lib/utils/parsing.cpp index 36b168290..605823082 100644 --- a/src/lib/utils/parsing.cpp +++ b/src/lib/utils/parsing.cpp @@ -1,6 +1,7 @@ /* * Various string utils and parsing functions * (C) 1999-2007,2013,2014 Jack Lloyd +* (C) 2015 Simon Warta (Kullo GmbH) * * Botan is released under the Simplified BSD License (see license.txt) */ @@ -9,6 +10,7 @@ #include <botan/exceptn.h> #include <botan/charset.h> #include <botan/get_byte.h> +#include <limits> #include <set> #include <stdexcept> @@ -18,11 +20,22 @@ u32bit to_u32bit(const std::string& str) { try { - return std::stoul(str, nullptr); + const auto integerValue = std::stoul(str); + + // integerValue might be uint64 + if (integerValue > std::numeric_limits<u32bit>::max()) + { + throw Invalid_Argument("Integer value exceeds 32 bit range: " + std::to_string(integerValue)); + } + + return integerValue; } - catch(std::exception&) + catch(std::exception& e) { - throw std::runtime_error("Could not read '" + str + "' as decimal string"); + auto message = std::string("Could not read '" + str + "' as decimal string"); + auto exceptionMessage = std::string(e.what()); + if (!exceptionMessage.empty()) message += ": " + exceptionMessage; + throw std::runtime_error(message); } } |