Skip to content

fix(minarch): core extension list overflow and NULL crash #880

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

Open
mhafaneh wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

fix(minarch): core extension list overflow and NULL crash #880

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
2 changes: 1 addition & 1 deletion workspace/all/minarch/ma_cheats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void Cheat_getPaths(char paths[CHEAT_MAX_PATHS][MAX_PATH], int* count) {
{
int i = 0;
char* ext;
char exts[128];
char exts[sizeof(core.extensions)];
if (core.extensions == NULL || strlen(core.extensions) >= sizeof(exts)) {
LOG_info("Invalid or too long core.extensions\n");
return;
Expand Down
2 changes: 1 addition & 1 deletion workspace/all/minarch/ma_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void Core_open(const char* core_path, const char* tag_name) {
Core_getName((char*)core_path, (char*)core.name);
sprintf((char*)core.version, "%s (%s)", info.library_name, info.library_version);
strcpy((char*)core.tag, tag_name);
strcpy((char*)core.extensions, info.valid_extensions);
snprintf((char*)core.extensions, sizeof(core.extensions), "%s", info.valid_extensions ? info.valid_extensions : "");

core.need_fullpath = info.need_fullpath;

Expand Down
2 changes: 1 addition & 1 deletion workspace/all/minarch/ma_game.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void Game_open(char* path) {
int supports_zip = 0;
int i = 0;
char* ext;
char exts[128];
char exts[sizeof(core.extensions)];
char* extensions[32];
strcpy(exts,core.extensions);
while ((ext=strtok(i?NULL:exts,"|"))) {
Expand Down
2 changes: 1 addition & 1 deletion workspace/all/minarch/ma_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct Core {
const char tag[8]; // eg. GBC
const char name[128]; // eg. gambatte
const char version[128]; // eg. Gambatte (v0.5.0-netlink 7e02df6)
const char extensions[128]; // eg. gb|gbc|dmg
const char extensions[256]; // eg. gb|gbc|dmg

const char config_dir[MAX_PATH]; // eg. /mnt/sdcard/.userdata/h700/GB-gambatte
const char states_dir[MAX_PATH]; // eg. /mnt/sdcard/.userdata/arm-480/GB-gambatte
Expand Down