Skip to content

prevent size overflow from bad data #555

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
Jamiras wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

prevent size overflow from bad data #555

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
12 changes: 11 additions & 1 deletion src/hash/rc_hash_disc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,7 +1226,7 @@ static int rc_hash_wii_disc(md5_state_t* md5, const rc_hash_iterator_t* iterator
const uint32_t MAX_CLUSTER_COUNT = 1024;

uint32_t partition_info_table[8];
uint32_t total_partition_count = 0;
uint64_t total_partition_count = 0;
uint32_t* partition_table;
uint64_t tmd_offset;
uint32_t tmd_size;
Expand Down Expand Up @@ -1276,7 +1276,17 @@ static int rc_hash_wii_disc(md5_state_t* md5, const rc_hash_iterator_t* iterator
return rc_hash_iterator_error(iterator, "No partitions found");
}

if (total_partition_count > 16) { /* Documentation suggests it should never be more than 4 */
free(buffer);
return rc_hash_iterator_error(iterator, "Too many partitions");
}

partition_table = (uint32_t*)malloc(total_partition_count * 4 * 2);
if (!partition_table) {
free(buffer);
return rc_hash_iterator_error(iterator, "Could not allocate partition table");
}

kx = 0;
for (jx = 0; jx < 8; jx += 2) {
rc_file_seek(iterator, file_handle, ((uint64_t)partition_info_table[jx + 1]) << 2, SEEK_SET);
Expand Down
Loading