Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

sound/discrete: Reserve space before taking addresses of new vector items.

Browse Source 
This code is still unsafe, 16 just happens to be enough for the systems
in MAME.  (The old vector_t implicitly reserved space for 16 items on
construction.)
This commit is contained in:
Vas Crabb 2020-09-30 22:12:44 +10:00
parent 88a1e42774
commit cc8cd6c33b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/devices/sound/discrete.cpp
View File

@ -278,7 +278,9 @@ void discrete_task::prepare_for_queue(int samples)
void discrete_task::check(discrete_task *dest_task) void discrete_task::check(discrete_task *dest_task)
{ {
int inputnum; // FIXME: this function takes addresses of elements of a vector that has items added later
// 16 is enough for the systems in MAME, but the code should be fixed properly
m_buffers.reserve(16);
/* Determine, which nodes in the task are referenced by nodes in dest_task /* Determine, which nodes in the task are referenced by nodes in dest_task
* and add them to the list of nodes to be buffered for further processing * and add them to the list of nodes to be buffered for further processing
@ -292,7 +294,7 @@ void discrete_task::check(discrete_task *dest_task)
discrete_base_node *dest_node = step_entry->self; discrete_base_node *dest_node = step_entry->self;
/* loop over all active inputs */ /* loop over all active inputs */
for (inputnum = 0; inputnum < dest_node->active_inputs(); inputnum++) for (int inputnum = 0; inputnum < dest_node->active_inputs(); inputnum++)
{ {
int inputnode_num = dest_node->input_node(inputnum); int inputnode_num = dest_node->input_node(inputnum);
if IS_VALUE_A_NODE(inputnode_num) if IS_VALUE_A_NODE(inputnode_num)
@ -301,10 +303,10 @@ void discrete_task::check(discrete_task *dest_task)
if (NODE_DEFAULT_NODE(task_node->block_node()) == NODE_DEFAULT_NODE(inputnode_num)) if (NODE_DEFAULT_NODE(task_node->block_node()) == NODE_DEFAULT_NODE(inputnode_num))
{ {
input_buffer source; input_buffer source;
int i, found = -1; int found = -1;
output_buffer *pbuf = nullptr; output_buffer *pbuf = nullptr;
for (i = 0; i < m_buffers.size(); i++) for (int i = 0; i < m_buffers.size(); i++)
// if (m_buffers[i].node->block_node() == inputnode_num) // if (m_buffers[i].node->block_node() == inputnode_num)
if (m_buffers[i].node_num == inputnode_num) if (m_buffers[i].node_num == inputnode_num)
{ {