aboutsummaryrefslogtreecommitdiffstats
path: root/libdevcore
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2016-11-29 22:14:10 +0800
committerGitHub <noreply@github.com>2016-11-29 22:14:10 +0800
commit071cbc4a9d78c3fad4136c88f0bb5919a19c28d7 (patch)
tree14e4e07c271bd2fc697e481a854a0b068a0fa85d /libdevcore
parentdadb4818ba230de02061ffd31ed71a0dec154885 (diff)
parenta9e92cb68601a19d5e0969e4f3336be612edc72e (diff)
downloaddexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar.gz
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar.bz2
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar.lz
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar.xz
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.tar.zst
dexon-solidity-071cbc4a9d78c3fad4136c88f0bb5919a19c28d7.zip
Merge pull request #1446 from ethereum/utf8-validate
Improve UTF8 validate
Diffstat (limited to 'libdevcore')
-rw-r--r--libdevcore/UTF8.cpp2
-rw-r--r--libdevcore/UTF8.h8
2 files changed, 8 insertions, 2 deletions
diff --git a/libdevcore/UTF8.cpp b/libdevcore/UTF8.cpp
index d742fe66..1c7ed17c 100644
--- a/libdevcore/UTF8.cpp
+++ b/libdevcore/UTF8.cpp
@@ -28,7 +28,7 @@ namespace dev
{
-bool validate(std::string const& _input, size_t& _invalidPosition)
+bool validateUTF8(std::string const& _input, size_t& _invalidPosition)
{
const size_t length = _input.length();
bool valid = true;
diff --git a/libdevcore/UTF8.h b/libdevcore/UTF8.h
index 9bdc2b4f..753914e3 100644
--- a/libdevcore/UTF8.h
+++ b/libdevcore/UTF8.h
@@ -30,6 +30,12 @@ namespace dev
/// Validate an input for UTF8 encoding
/// @returns false if it is invalid and the first invalid position in invalidPosition
-bool validate(std::string const& _input, size_t& _invalidPosition);
+bool validateUTF8(std::string const& _input, size_t& _invalidPosition);
+
+inline bool validateUTF8(std::string const& _input)
+{
+ size_t invalidPos;
+ return validateUTF8(_input, invalidPos);
+}
}