Skip to content

fix: harden strcat overflow and unchecked fwrite in model save #3188

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

Closed
tombudd wants to merge 1 commit into from
+4 −1
Closed

fix: harden strcat overflow and unchecked fwrite in model save #3188

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
3 changes: 3 additions & 0 deletions src/engine/engine_io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,9 @@ void mj_saveModel(const mjModel* m, const char* filename, void* buffer, int buff
}

if (fp) {
if (ferror(fp)) {
mju_warning("Error writing to file '%s'", filename);
}
fclose(fp);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ui/ui_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1894,7 +1894,7 @@ static void shortcuthelp(mjrRect r, int modifier, int shortcut,
}

// combine
strcat(text, key);
mjSTRNCAT(text, key);

// make rectangle for shortcut
int g_textver = SCL(ui->spacing.textver, con);
Expand Down