Skip to content

[lldb] Disallow left shifts of negative values in the interpreter #119620

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
Merged

[lldb] Disallow left shifts of negative values in the interpreter #119620

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
8 changes: 5 additions & 3 deletions lldb/source/DataFormatters/FormatterBytecode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ llvm::Error Interpret(std::vector<ControlStackElement> &control,
BINOP_CHECKZERO(%);
continue;
case op_shl:
#define SHIFTOP(OP) \
#define SHIFTOP(OP, LEFT) \
{ \
TYPE_CHECK(Any, UInt); \
uint64_t y = data.Pop<uint64_t>(); \
Expand All @@ -390,16 +390,18 @@ llvm::Error Interpret(std::vector<ControlStackElement> &control,
data.Push(x OP y); \
} else if (std::holds_alternative<int64_t>(data.back())) { \
int64_t x = data.Pop<int64_t>(); \
if (x < 0 && LEFT) \
return error("left shift of negative value"); \
if (y > 64) \
return error("shift out of bounds"); \
data.Push(x OP y); \
} else \
return error("unsupported data types"); \
}
SHIFTOP(<<);
SHIFTOP(<<, true);
continue;
case op_shr:
SHIFTOP(<<);
SHIFTOP(>>, false);
continue;
case op_and:
BINOP(&);
Expand Down
7 changes: 5 additions & 2 deletions lldb/unittests/DataFormatter/FormatterBytecodeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,12 @@ TEST_F(FormatterBytecodeTest, ArithOps) {
{
DataStack data;
unsigned char minus_one = 127;
ASSERT_TRUE(
ASSERT_FALSE(
Interpret({op_lit_int, minus_one, op_lit_uint, 2, op_shl}, data));
ASSERT_EQ(data.Pop<int64_t>(), -4);
unsigned char minus_two = 126;
ASSERT_TRUE(
Interpret({op_lit_int, minus_two, op_lit_uint, 1, op_shr}, data));
ASSERT_EQ(data.Pop<int64_t>(), -1);
}
{
DataStack data;
Expand Down
Loading