aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <c@ethdev.com>2016-09-02 01:31:17 +0800
committerchriseth <c@ethdev.com>2016-09-02 02:07:14 +0800
commit4134834ff3adedcf31d73edf5d25bfdc57994289 (patch)
tree4ce9bb7fc654321005214846ef8442218aaf7580
parentb5d941d3d9f32193c7f9094dee20511585508f6a (diff)
downloaddexon-solidity-4134834ff3adedcf31d73edf5d25bfdc57994289.tar.gz
dexon-solidity-4134834ff3adedcf31d73edf5d25bfdc57994289.tar.zst
dexon-solidity-4134834ff3adedcf31d73edf5d25bfdc57994289.zip
Guard encoding crashes with assertions.
-rw-r--r--Changelog.md1
-rw-r--r--libsolidity/codegen/CompilerUtils.cpp8
2 files changed, 9 insertions, 0 deletions
diff --git a/Changelog.md b/Changelog.md
index 25890890..4bc750f0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -39,6 +39,7 @@ Bugfixes:
* JSON AST: nodes were added at wrong parent
* Why3 translator: crash fix for exponentiation
* Type Checker: Fallback function cannot return data anymore.
+ * Code Generator: Fix crash when sha3() was used on unsupported types.
Lots of changes to the documentation mainly by voluntary external contributors.
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index d7d17b8e..c02a8126 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -160,7 +160,15 @@ void CompilerUtils::encodeToMemory(
TypePointers targetTypes = _targetTypes.empty() ? _givenTypes : _targetTypes;
solAssert(targetTypes.size() == _givenTypes.size(), "");
for (TypePointer& t: targetTypes)
+ {
+ solAssert(
+ t->mobileType() &&
+ t->mobileType()->interfaceType(_encodeAsLibraryTypes) &&
+ t->mobileType()->interfaceType(_encodeAsLibraryTypes)->encodingType(),
+ "Encoding type " + t->toString() + " not yet implemented."
+ );
t = t->mobileType()->interfaceType(_encodeAsLibraryTypes)->encodingType();
+ }
// Stack during operation:
// <v1> <v2> ... <vn> <mem_start> <dyn_head_1> ... <dyn_head_r> <end_of_mem>