diff options
| author | chriseth <chris@ethereum.org> | 2016-09-09 16:30:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 16:30:29 +0800 |
| commit | fb86d90e080b0fbbcf7b7f328352f9794802c8c4 (patch) | |
| tree | f0a47a3e3f8276f4b59e03f2ca31a421eb43d3e4 /libsolidity/interface/Version.cpp | |
| parent | 8a057e3f854a0f9ef5d7f09ff861da90079ded61 (diff) | |
| parent | 6a55405160475fa6166df4888c8d821b4105f879 (diff) | |
| download | dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar.gz dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar.bz2 dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar.lz dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar.xz dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.tar.zst dexon-solidity-fb86d90e080b0fbbcf7b7f328352f9794802c8c4.zip | |
Merge pull request #1070 from ethereum/devversion
Fix problems with version strings.
Diffstat (limited to 'libsolidity/interface/Version.cpp')
| -rw-r--r-- | libsolidity/interface/Version.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp index 31ba4afc..0dca1ced 100644 --- a/libsolidity/interface/Version.cpp +++ b/libsolidity/interface/Version.cpp @@ -58,12 +58,14 @@ bytes dev::solidity::binaryVersion() solAssert(i < VersionString.size() && VersionString[i] == '.', ""); ++i; ret.push_back(byte(parseDecimal())); - solAssert(i < VersionString.size() && VersionString[i] == '-', ""); + solAssert(i < VersionString.size() && (VersionString[i] == '-' || VersionString[i] == '+'), ""); ++i; + size_t commitpos = VersionString.find("commit."); + solAssert(commitpos != string::npos, ""); + i = commitpos + 7; solAssert(i + 7 < VersionString.size(), ""); bytes commitHash = fromHex(VersionString.substr(i, 8)); - if (commitHash.empty()) - commitHash = bytes(4, 0); + solAssert(!commitHash.empty(), ""); ret += commitHash; solAssert(ret.size() == 1 + 3 + 4, ""); |