Skip to content

馃悶 Fix TStack length #1556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atarpara merged 1 commit into from
Sep 1, 2026
Merged

馃悶 Fix TStack length #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/utils/LibTransient.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ library LibTransient {
/// @solidity memory-safe-assembly
assembly {
topPtr := tload(ptr.slot)
if iszero(topPtr) {
if iszero(shl(128, topPtr)) {
mstore(0x00, 0xbb704e21) // `StackIsEmpty()`.
revert(0x1c, 0x04)
}
Expand All @@ -793,7 +793,7 @@ library LibTransient {
/// @solidity memory-safe-assembly
assembly {
lastTopPtr := tload(ptr.slot)
if iszero(lastTopPtr) {
if iszero(shl(128, lastTopPtr)) {
mstore(0x00, 0xbb704e21) // `StackIsEmpty()`.
revert(0x1c, 0x04)
}
Expand Down
4 changes: 2 additions & 2 deletions src/utils/g/LibTransient.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ library LibTransient {
/// @solidity memory-safe-assembly
assembly {
topPtr := tload(ptr.slot)
if iszero(topPtr) {
if iszero(shl(128, topPtr)) {
mstore(0x00, 0xbb704e21) // `StackIsEmpty()`.
revert(0x1c, 0x04)
}
Expand All @@ -803,7 +803,7 @@ library LibTransient {
/// @solidity memory-safe-assembly
assembly {
lastTopPtr := tload(ptr.slot)
if iszero(lastTopPtr) {
if iszero(shl(128, lastTopPtr)) {
mstore(0x00, 0xbb704e21) // `StackIsEmpty()`.
revert(0x1c, 0x04)
}
Expand Down
48 changes: 48 additions & 0 deletions test/LibTransient.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,54 @@ contract LibTransientTest is SoladyTest {
this.stackPop(0);
}

function testClearedStackTopReverts(uint256 stackSlot, uint256 clears) public {
vm.expectRevert(LibTransient.StackIsEmpty.selector);
this.stackPlaceClearThenTop(stackSlot, _bound(clears, 1, 3));
}

function testClearedStackPopReverts(uint256 stackSlot, uint256 clears) public {
vm.expectRevert(LibTransient.StackIsEmpty.selector);
this.stackPlaceClearThenPop(stackSlot, _bound(clears, 1, 3));
}

function stackPlaceClearThenTop(uint256 stackSlot, uint256 clears) public returns (bytes32) {
LibTransient.TStack storage stack = LibTransient.tStack(stackSlot);
stack.place();
for (uint256 i; i < clears; ++i) {
stack.clear();
}
assertEq(stack.length(), 0);
assertEq(stack.peek(), 0);
return stack.top();
}

function stackPlaceClearThenPop(uint256 stackSlot, uint256 clears) public returns (bytes32) {
LibTransient.TStack storage stack = LibTransient.tStack(stackSlot);
stack.place();
for (uint256 i; i < clears; ++i) {
stack.clear();
}
assertEq(stack.length(), 0);
assertEq(stack.peek(), 0);
return stack.pop();
}

function testStackClearIsolatesItems(uint256 stackSlot) public {
bytes32 oldPtr = LibTransient.tStack(stackSlot).place();
LibTransient.tBytes32(oldPtr).set(bytes32(uint256(0xa11ce)));

LibTransient.tStack(stackSlot).clear();

bytes32 freshPtr = LibTransient.tStack(stackSlot).place();
assertTrue(freshPtr != oldPtr);
assertEq(LibTransient.tBytes32(freshPtr).get(), 0);
assertEq(LibTransient.tStack(stackSlot).length(), 1);
assertEq(LibTransient.tStack(stackSlot).top(), freshPtr);
assertEq(LibTransient.tStack(stackSlot).peek(), freshPtr);
// `clear` only abandons the old region, it does not wipe it.
assertEq(LibTransient.tBytes32(oldPtr).get(), bytes32(uint256(0xa11ce)));
}

function stackTop(uint256 stackSlot) public view returns (bytes32) {
return LibTransient.tStack(stackSlot).top();
}
Expand Down