cerc-io/solidity
15
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4765 from ethereum/fixes-issue-4673

Browse Source 
[WIP] Fixes issue where computing storage size for a number would take too long (or even cause a crash).
This commit is contained in:
chriseth 2018-08-14 17:34:04 +02:00 committed by GitHub
commit 3f42118d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -102,6 +102,7 @@ Bugfixes:
* Type Checker: Allow assignments to local variables of mapping types. * Type Checker: Allow assignments to local variables of mapping types.
* Type Checker: Consider fixed size arrays when checking for recursive structs. * Type Checker: Consider fixed size arrays when checking for recursive structs.
* Type Checker: Fix crashes in erroneous tuple assignments in which the type of the right hand side cannot be determined. * Type Checker: Fix crashes in erroneous tuple assignments in which the type of the right hand side cannot be determined.
* Type Checker: Fix freeze for negative fixed-point literals very close to ``0``, such as ``-1e-100``.
* Type Checker: Report error when using structs in events without experimental ABIEncoderV2. This used to crash or log the wrong values. * Type Checker: Report error when using structs in events without experimental ABIEncoderV2. This used to crash or log the wrong values.
* Type System: Allow arbitrary exponents for literals with a mantissa of zero. * Type System: Allow arbitrary exponents for literals with a mantissa of zero.

3
libsolidity/ast/Types.cpp
View File

@ -1278,7 +1278,8 @@ shared_ptr<FixedPointType const> RationalNumberType::fixedPointType() const
return shared_ptr<FixedPointType const>(); return shared_ptr<FixedPointType const>();
// This means we round towards zero for positive and negative values. // This means we round towards zero for positive and negative values.
bigint v = value.numerator() / value.denominator(); bigint v = value.numerator() / value.denominator();
if (negative)
if (negative && v != 0)
// modify value to satisfy bit requirements for negative numbers: // modify value to satisfy bit requirements for negative numbers:
// add one bit for sign and decrement because negative numbers can be larger // add one bit for sign and decrement because negative numbers can be larger
v = (v - 1) << 1; v = (v - 1) << 1;

3
libsolidity/ast/Types.h
View File

@ -446,7 +446,8 @@ public:
/// @returns the smallest integer type that can hold the value or an empty pointer if not possible. /// @returns the smallest integer type that can hold the value or an empty pointer if not possible.
std::shared_ptr<IntegerType const> integerType() const; std::shared_ptr<IntegerType const> integerType() const;
/// @returns the smallest fixed type that can hold the value or incurs the least precision loss. /// @returns the smallest fixed type that can hold the value or incurs the least precision loss,
/// unless the value was truncated, then a suitable type will be chosen to indicate such event.
/// If the integer part does not fit, returns an empty pointer. /// If the integer part does not fit, returns an empty pointer.
std::shared_ptr<FixedPointType const> fixedPointType() const; std::shared_ptr<FixedPointType const> fixedPointType() const;

4
test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol Normal file
View File

@ -0,0 +1,4 @@
contract C {
fixed8x80 a = -1e-100;
}
// ----