bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

concatLists: Don't pass NULL pointers to memcpy.

Browse source 
This is UB, even if the size is 0. See #1976.

Fixes #1976.
This commit is contained in:
Shea Levy 2018-03-14 23:44:02 -04:00
parent 55aa622fb1
commit e2088febf3
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/eval.cc
View file

@ -1316,7 +1316,8 @@ void EvalState::concatLists(Value & v, unsigned int nrLists, Value * * lists, co
auto out = v.listElems(); auto out = v.listElems();
for (unsigned int n = 0, pos = 0; n < nrLists; ++n) { for (unsigned int n = 0, pos = 0; n < nrLists; ++n) {
unsigned int l = lists[n]->listSize(); unsigned int l = lists[n]->listSize();
memcpy(out + pos, lists[n]->listElems(), l * sizeof(Value *)); if (l)
memcpy(out + pos, lists[n]->listElems(), l * sizeof(Value *));
pos += l; pos += l;
} }
} }