Skip to content

Fix/addition stack smash #20

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
brwarner merged 1 commit into from
Feb 11, 2021
Merged

Fix/addition stack smash #20

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: 4 additions & 4 deletions inkcpp/value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ namespace ink
// Copy left values into new
int i = 0, j = 0;
bool overflow = false;
while (left._data[j].type != data_type::none && j < VALUE_DATA_LENGTH && !overflow)
while (j < VALUE_DATA_LENGTH && left._data[j].type != data_type::none && !overflow)
{
if (i >= VALUE_DATA_LENGTH)
{
Expand All @@ -204,7 +204,7 @@ namespace ink

// Copy right values into new
j = 0;
while (right._data[j].type != data_type::none && j < VALUE_DATA_LENGTH && !overflow)
while (j < VALUE_DATA_LENGTH && right._data[j].type != data_type::none && !overflow)
{
if (i >= VALUE_DATA_LENGTH)
{
Expand All @@ -222,10 +222,10 @@ namespace ink

// Push everything into the stream
j = 0;
while (left._data[j].type != data_type::none && j < VALUE_DATA_LENGTH)
while (j < VALUE_DATA_LENGTH && left._data[j].type != data_type::none)
stream << left._data[j++];
j = 0;
while (right._data[j].type != data_type::none && j < VALUE_DATA_LENGTH)
while (j < VALUE_DATA_LENGTH && right._data[j].type != data_type::none)
stream << right._data[j++];

// Pull out into a new string
Expand Down