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

8962e714 · Laurent Aimar · e7192dbf · 8962e714
Commit 8962e714 authored May 25, 2012 by Laurent Aimar
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

modules/video_filter/deinterlace/merge.c modules/video_filter/deinterlace/merge.c +1 -1

No files found.
--- a/modules/video_filter/deinterlace/merge.c
+++ b/modules/video_filter/deinterlace/merge.c
@@ -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)
    {