Skip to content
Snippets Groups Projects
Commit 381ad90b authored by Logan Aerl Arias's avatar Logan Aerl Arias
Browse files

Merge branch 'fix-mtag-buffer-overflow' into 'next'

Fix buffer overflow when tag bits are set

See merge request STJr/SRB2!2194
parents 3ed2221e 7e7ff84f
Branches
Tags
2 merge requests!2355fix newer versions of mixerx,!2194Fix buffer overflow when tag bits are set
Pipeline #1617 canceled
...@@ -180,10 +180,10 @@ void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id) ...@@ -180,10 +180,10 @@ void Taggroup_Add (taggroup_t *garray[], const mtag_t tag, size_t id)
if (Taggroup_Find(group, id) != (size_t)-1) if (Taggroup_Find(group, id) != (size_t)-1)
return; return;
if (! in_bit_array(tags_available, tag)) if (! in_bit_array(tags_available, (UINT16)tag))
{ {
num_tags++; num_tags++;
set_bit_array(tags_available, tag); set_bit_array(tags_available, (UINT16)tag);
} }
// Create group if empty. // Create group if empty.
...@@ -220,10 +220,10 @@ static void Taggroup_Add_Init(taggroup_t *garray[], const mtag_t tag, size_t id) ...@@ -220,10 +220,10 @@ static void Taggroup_Add_Init(taggroup_t *garray[], const mtag_t tag, size_t id)
group = garray[(UINT16)tag]; group = garray[(UINT16)tag];
if (! in_bit_array(tags_available, tag)) if (! in_bit_array(tags_available, (UINT16)tag))
{ {
num_tags++; num_tags++;
set_bit_array(tags_available, tag); set_bit_array(tags_available, (UINT16)tag);
} }
// Create group if empty. // Create group if empty.
...@@ -271,7 +271,7 @@ void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id) ...@@ -271,7 +271,7 @@ void Taggroup_Remove (taggroup_t *garray[], const mtag_t tag, size_t id)
if (group->count == 1 && total_elements_with_tag(tag) == 1) if (group->count == 1 && total_elements_with_tag(tag) == 1)
{ {
num_tags--; num_tags--;
unset_bit_array(tags_available, tag); unset_bit_array(tags_available, (UINT16)tag);
} }
// Strip away taggroup if no elements left. // Strip away taggroup if no elements left.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment