luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vvp: Handle copying of empty dynamic array and queue 

An empty dynamic array or queue is represented by a null object in vvp.

Currently when trying to copy such an object results in undefined behavior
in various places. Either hitting an assert or causing a nullptr
dereference.

Make sure that the empty object is handled correctly by treating it as a
special case.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2022-09-19 13:25:28 +02:00
parent fd69d4e09c
commit 567df9c29a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vvp/vthread.cc
View File

@ -3000,7 +3000,14 @@ bool of_DIV_WR(vthread_t thr, vvp_code_t)
*/
bool of_DUP_OBJ(vthread_t thr, vvp_code_t)
{
thr->push_object(thr->peek_object().duplicate());
vvp_object_t src = thr->peek_object();
// If it is null push a new null object
if (src.test_nil())
thr->push_object(vvp_object_t());
else
thr->push_object(src.duplicate());
return true;
}
@ -5542,7 +5549,9 @@ bool of_SCOPY(vthread_t thr, vvp_code_t)
thr->pop_object(tmp);
vvp_object_t&dest = thr->peek_object();
dest.shallow_copy(tmp);
// If it is null there is nothing to copy
if (!tmp.test_nil())
dest.shallow_copy(tmp);
return true;
}
@ -6099,7 +6108,12 @@ static bool store_qobj(vthread_t thr, vvp_code_t cp, unsigned wid=0)
vvp_object_t src;
thr->pop_object(src);
queue->copy_elems(src, max_size);
// If it is null just clear the queue
if (src.test_nil())
queue->erase_tail(0);
else
queue->copy_elems(src, max_size);
return true;
}