Skip to content

Fix critical crash bugs: null pointer dereferences, memory leaks, and buffer overflows #8

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

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
+115 −44
Draft

Fix critical crash bugs: null pointer dereferences, memory leaks, and buffer overflows #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0509be6
Initial plan
Copilot Aug 13, 2025
ef2e748
Fix critical crash bugs: null pointer checks, memory management, buff…
Copilot Aug 13, 2025
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
24 changes: 13 additions & 11 deletions src/applications/Tim/Snake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ class Snake : public Application
}

// iterate over the queue and check if the most recent element collides with an older one
for (int i = 0; i < snake_pieces.size() - 1; i++)
{
if (snake_pieces.at(i).x == snake_pieces.back().x && snake_pieces.at(i).y == snake_pieces.back().y)
if (snake_pieces.size() > 1) {
for (int i = 0; i < (int)snake_pieces.size() - 1; i++)
{
loose_state = true;
cm->set_controls(button_a);
cm->run_animation(new Splash(snake_pieces.back().x, snake_pieces.back().y, MatrixManager::Color(255, 0, 0)), 1000, 1000);
return;
if (snake_pieces.at(i).x == snake_pieces.back().x && snake_pieces.at(i).y == snake_pieces.back().y)
{
loose_state = true;
cm->set_controls(button_a);
cm->run_animation(new Splash(snake_pieces.back().x, snake_pieces.back().y, MatrixManager::Color(255, 0, 0)), 1000, 1000);
return;
}
}
}

Expand All @@ -83,8 +85,8 @@ class Snake : public Application

if (food_collision)
{
food_position.x = random(0, 11);
food_position.y = random(0, 11);
food_position.x = random(0, 12);
food_position.y = random(0, 12);
}
}

Expand Down Expand Up @@ -154,8 +156,8 @@ class Snake : public Application
snake_pieces.push_back({3, 5});

food_position = {
random(0, 11),
random(0, 11)};
random(0, 12),
random(0, 12)};
cm->set_controls(button_up | button_right | button_down | button_left);
loose_state = false;
direction = -1;
Expand Down
12 changes: 11 additions & 1 deletion src/system/MatrixManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ class MatrixManager
return;
}
int pixel = this->calculate_strip_pixel(x, y);
if (pixel < 0 || pixel >= 144) {
if (!ignoreOutOfRange) {
Serial.println(F("Invalid pixel index\n"));
}
return;
}
pixels[pixel].R = r;
pixels[pixel].G = g;
pixels[pixel].B = b;
Expand All @@ -81,7 +87,7 @@ class MatrixManager
*/
void set_string(int n, int r, int g, int b)
{
if (n > 143)
if (n < 0 || n > 143)
{
Serial.println(F("Out of range\n"));
return;
Expand Down Expand Up @@ -447,6 +453,10 @@ class MatrixManager
*/
void circle(int x, int y, int radius, uint32_t color, bool filled = true, int u = 2)
{
if (u <= 0) {
Serial.println(F("Invalid step size for circle\n"));
return;
}
for (int i = 0; i < 360; i += u)
{
if (i == 0)
Expand Down
90 changes: 61 additions & 29 deletions src/system/SystemManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,11 @@ class SystemManager
{
if (current_internal_app->is_wrench)
{
if (!transmitting_wrench)
if (!transmitting_wrench && wc != nullptr)
{
wr_callFunction(wc, "draw");
}
if (wr_getLastError(w) != 0)
if (w != nullptr && wr_getLastError(w) != 0)
{
Serial.print(F("WREN Error when drawing: "));
Serial.println(wr_getLastError(w));
Expand Down Expand Up @@ -196,12 +196,12 @@ class SystemManager
game_loop_timer = millis();
if (current_internal_app->is_wrench)
{
if (!transmitting_wrench)
if (!transmitting_wrench && wc != nullptr)
{
wr_callFunction(wc, "game_loop");
}

if (wr_getLastError(w) != 0)
if (w != nullptr && wr_getLastError(w) != 0)
{
Serial.print(F("WREN Error when game_loop: "));
Serial.println(wr_getLastError(w));
Expand Down Expand Up @@ -283,8 +283,9 @@ class SystemManager
if (current_internal_app->is_wrench)
{
Serial.println(F("WRENCH WAS ACTIVE"));
if (!devMode)
if (!devMode && this->wrench_code != nullptr)
delete[] this->wrench_code;
this->wrench_code = nullptr;
}
else
{
Expand Down Expand Up @@ -318,6 +319,11 @@ class SystemManager
{
Serial.println(F("WRENCH ACTIVE"));
w = wr_newState(); // create the state
if (w == nullptr) {
Serial.println(F("Failed to create Wrench state"));
return;
}

wrench_wrapper::register_wrench_functions(w, &ce);
wr_loadMathLib(w);
wr_loadStringLib(w);
Expand All @@ -332,11 +338,21 @@ class SystemManager

if (!devMode)
{
// Clean up existing wrench_code to prevent memory leak
if (this->wrench_code != nullptr) {
delete[] this->wrench_code;
this->wrench_code = nullptr;
}
this->wrench_code = new unsigned char[current_internal_app->wrench_code_size];
memcpy_P(this->wrench_code, current_internal_app->wrench_code, current_internal_app->wrench_code_size);
}

wc = wr_run(w, this->wrench_code, current_internal_app->wrench_code_size); // load and run the code!
if (wc == nullptr) {
Serial.println(F("Failed to run Wrench code"));
return;
}

wr_setAllocatedMemoryGCHint(w, 1000);

//print wr_getLastError(w);
Expand Down Expand Up @@ -811,9 +827,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::UP);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::UP);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -825,9 +843,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::DOWN);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::DOWN);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -839,9 +859,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::LEFT);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::LEFT);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -853,9 +875,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::RIGHT);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::RIGHT);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -867,9 +891,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::MIDDLE);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::MIDDLE);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -881,9 +907,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::A);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::A);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -895,9 +923,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::B);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::B);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand All @@ -909,9 +939,11 @@ class SystemManager
{
if (this->current_internal_app->is_wrench)
{
WRValue val;
wr_makeInt(&val, Event::C);
wr_callFunction(wc, "on_event", &val, 1);
if (wc != nullptr) {
WRValue val;
wr_makeInt(&val, Event::C);
wr_callFunction(wc, "on_event", &val, 1);
}
}
else
{
Expand Down
33 changes: 30 additions & 3 deletions src/system/WrenchWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,32 @@ namespace wrench_wrapper
{
if (argn != 3) return;
auto ce = static_cast<ControlElements*>(usr);
ce->mm->set(argv[0].asInt(), argv[1].asInt(), argv[2].asInt());
if (ce == nullptr || ce->mm == nullptr) return;

int x = argv[0].asInt();
int y = argv[1].asInt();
int color = argv[2].asInt();

// Bounds checking to prevent crashes
if (x >= 0 && x <= 11 && y >= 0 && y <= 11) {
ce->mm->set(x, y, color);
}
wr_makeInt(&retVal, 1);
}

inline void off_pixel(WRContext* c, const WRValue* argv, const int argn, WRValue& retVal, void* usr)
{
if (argn != 2) return;
auto* ce = static_cast<ControlElements*>(usr);
ce->mm->off(argv[0].asInt(), argv[1].asInt());
if (ce == nullptr || ce->mm == nullptr) return;

int x = argv[0].asInt();
int y = argv[1].asInt();

// Bounds checking to prevent crashes
if (x >= 0 && x <= 11 && y >= 0 && y <= 11) {
ce->mm->off(x, y);
}
wr_makeInt(&retVal, 1);
}

Expand Down Expand Up @@ -163,7 +180,17 @@ namespace wrench_wrapper
{
if (argn != 4) return;
auto ce = static_cast<ControlElements*>(usr);
ce->mm->circle(argv[0].asInt(), argv[1].asInt(), argv[2].asInt(), argv[3].asInt());
if (ce == nullptr || ce->mm == nullptr) return;

int x = argv[0].asInt();
int y = argv[1].asInt();
int radius = argv[2].asInt();
int color = argv[3].asInt();

// Validate radius to prevent issues
if (radius >= 0 && radius < 50) {
ce->mm->circle(x, y, radius, color);
}
wr_makeInt(&retVal, 1);
}

Expand Down