Disallow delete on types containing nested mappings. #11843

Marenz · 2021-08-25T12:51:45Z

fixes #8535

Changelog.md

libsolidity/analysis/TypeChecker.cpp

test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol

libsolidity/analysis/TypeChecker.cpp

hrkrshnn · 2021-08-25T14:26:46Z

libsolidity/analysis/TypeChecker.cpp

@@ -1613,6 +1613,13 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	_operation.annotation().isPure = !modifying && *_operation.subExpression().annotation().isPure;
 	_operation.annotation().isLValue = false;

+	if (op == Token::Delete && subExprType->nameable() && subExprType->containsNestedMapping())


With the delete check, I feel that nameable condition can be removed. But not sure :(

I removed it and checked isoltest locally. If the CI is happy I'd say it's safe?

I looked a bit through the code and tested some cases and it seems this is good.

chriseth · 2021-08-30T14:49:24Z

libsolidity/analysis/TypeChecker.cpp

@@ -1613,6 +1613,13 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	_operation.annotation().isPure = !modifying && *_operation.subExpression().annotation().isPure;
 	_operation.annotation().isLValue = false;

+	if (op == Token::Delete && subExprType->containsNestedMapping())


Is it more convenient to move this check inside Type::unaryOperatorResult? We would only need it on reference types.

Could could move it, but the error reporter is not available in the type and in this particular visit, the string part of the return value of that function is also not used for the error message

I could change the call here to use the err message returned.. it would change a few.. like this:

syntaxTests/negation.sol: FAIL Contract: contract test { function f() public pure { int x; uint y = uint(-x); -y; } } Expected result: TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256 Obtained result: TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256: Unary negation is only allowed for signed integers.

That actually sounds good!

ekpyron · 2021-09-06T10:59:59Z

Changelog.md

 * Inline Assembly: Consider functions, function parameters and return variables for shadowing checks.
+ * ``error`` is now a keyword that can only be used for defining errors.


That's a rebase artifact, isn't it?

oh. Yes, I must have missed that

ekpyron

Looks fine to me.

ekpyron · 2021-09-06T15:24:34Z

Changelog.md

+ * Disallow ``.pop()`` on arrays containing nested mappings.
+ * Disallow ``delete`` on types that contain nested mappings.


Is this in alphabetic order :-D? I'm honestly not sure :-D. [no need to do anything as far as I'm concerned]

It is. . before d, also originally done by vim using :sort (that's why we had that rebase artefact, it reordered another change, too)

ekpyron · 2021-09-06T15:36:22Z

libsolidity/analysis/TypeChecker.cpp

-	Type const* t = type(_operation.subExpression())->unaryOperatorResult(op);
-	if (!t)
+	TypeResult result = subExprType->unaryOperatorResult(op);
+	Type const* t = result;


Can't you just remove this and replace every t below with result? If not: also fine.

I remember I actually tried that and that there was a problem with that. Something with TypeResult vs Type..

Ah yes. We're assigning to t in line 1615 and that's why. Assigning to a TypeResult is at the very least confusing here

In my mind assigning to TypeResult is not that big of a deal (although not sure if it just works and jumping through hoops for being able to would definitely be too much). I'm fine with keeping the t.

Manual Resolved Conflicts: Changelog.md * Updated changelog test/externalTests/ens.sh * Merged fixes for upstream from both develop and breaking test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol * Removed in #11735 (breaking) test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol * Removed in #12209 (breaking) test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol * Removed in #11843 (breaking) test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol * Removed in #11843 (breaking) test/libsolidity/syntaxTests/inlineAssembly/basefee_berlin_function.sol * Used version of file from #11842 (breaking)

Marenz force-pushed the no-delete-on-mapping-8535 branch from 11485af to 8d85d2e Compare August 25, 2021 13:39

hrkrshnn reviewed Aug 25, 2021

View reviewed changes

Marenz force-pushed the no-delete-on-mapping-8535 branch from 8d85d2e to 5e44195 Compare August 25, 2021 14:06

hrkrshnn reviewed Aug 25, 2021

View reviewed changes

libsolidity/analysis/TypeChecker.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the no-delete-on-mapping-8535 branch from 5e44195 to 65246b6 Compare August 25, 2021 14:16

hrkrshnn reviewed Aug 25, 2021

View reviewed changes

libsolidity/analysis/TypeChecker.cpp Outdated Show resolved Hide resolved

Marenz force-pushed the no-delete-on-mapping-8535 branch from 65246b6 to ba54358 Compare August 25, 2021 14:25

hrkrshnn reviewed Aug 25, 2021

View reviewed changes

Marenz force-pushed the no-delete-on-mapping-8535 branch 2 times, most recently from c9b6fca to 78fc149 Compare August 26, 2021 09:41

chriseth reviewed Aug 30, 2021

View reviewed changes

Marenz force-pushed the no-delete-on-mapping-8535 branch 2 times, most recently from 5f54d59 to d9b18d8 Compare September 1, 2021 13:27

ekpyron reviewed Sep 6, 2021

View reviewed changes

Disallow delete on types containing nested mappings.

d248d35

Marenz force-pushed the no-delete-on-mapping-8535 branch from d9b18d8 to d248d35 Compare September 6, 2021 12:17

ekpyron approved these changes Sep 6, 2021

View reviewed changes

ekpyron merged commit 8f0401f into breaking Sep 10, 2021

ekpyron deleted the no-delete-on-mapping-8535 branch September 10, 2021 12:36

frangio mentioned this pull request May 6, 2022

Document limitation of delete for EnumerableSet and Map OpenZeppelin/openzeppelin-contracts#3400

Closed

lucasAlonso mentioned this pull request May 15, 2022

Add Warning about use of delete OpenZeppelin/openzeppelin-contracts#3412

Merged

1 task

cameel mentioned this pull request May 18, 2022

Disallow RETURNDATASIZE and RETURNDATACOPY in inline assembly blocks in pure functions #13028

Merged

Marenz mentioned this pull request Aug 30, 2022

Merge branch 'develop' into breaking #13459

Merged

sherlock-admin mentioned this pull request Apr 22, 2023

nobody2018 - updateCommitmentBorrowers does not delete all existing users sherlock-audit/2023-03-teller-judging#88

Open

aswin9393 mentioned this pull request Feb 22, 2024

EnumerableSetUpgradeable.sol aswin9393/hiddensatoshi#2

Closed

sherlock-admin4 mentioned this pull request Jun 20, 2024

PNS - Improper Removal of Roles in RoleAccessControlFacet.revokeAllRole() sherlock-audit/2024-05-elfi-protocol-judging#180

Closed

Berbex mentioned this pull request Nov 6, 2024

[DPR-01M] Inexistent Revocation of Administrators Nexera-Foundation/Minimalistic-ERC-7208#15

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Disallow delete on types containing nested mappings. #11843

Disallow delete on types containing nested mappings. #11843

Marenz commented Aug 25, 2021

hrkrshnn Aug 25, 2021

Marenz Aug 26, 2021

Marenz Aug 26, 2021

chriseth Aug 30, 2021

Marenz Sep 1, 2021

Marenz Sep 1, 2021

chriseth Sep 1, 2021

ekpyron Sep 6, 2021

Marenz Sep 6, 2021

ekpyron left a comment

ekpyron Sep 6, 2021

Marenz Sep 6, 2021 •

edited

Loading

ekpyron Sep 6, 2021

Marenz Sep 6, 2021

Marenz Sep 6, 2021

ekpyron Sep 6, 2021

		* Inline Assembly: Consider functions, function parameters and return variables for shadowing checks.
		* ``error`` is now a keyword that can only be used for defining errors.

		* Disallow ``.pop()`` on arrays containing nested mappings.
		* Disallow ``delete`` on types that contain nested mappings.

Disallow delete on types containing nested mappings. #11843

Disallow delete on types containing nested mappings. #11843

Conversation

Marenz commented Aug 25, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ekpyron left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Marenz Sep 6, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Marenz Sep 6, 2021 •

edited

Loading