Commit 8962e714 authored by Laurent Aimar's avatar Laurent Aimar

Fixed alignment and potential overread/write in MergeNEON().

parent e7192dbf
......@@ -220,7 +220,7 @@ void MergeNEON (void *restrict out, const void *in1,
uint8_t *outp = out;
const uint8_t *in1p = in1;
const uint8_t *in2p = in2;
size_t mis = ((uintptr_t)outp) & 15;
size_t mis = __MIN((16 - ((uintptr_t)outp & 15)) & 15, n);
if (mis)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment