vlc | branch: master | Laurent Aimar <[email protected]> | Fri May 25 20:59:05 2012 +0200| [8962e71486de10e7231e99d4f312937f88e540e9] | committer: Laurent Aimar
Fixed alignment and potential overread/write in MergeNEON(). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8962e71486de10e7231e99d4f312937f88e540e9 --- modules/video_filter/deinterlace/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/video_filter/deinterlace/merge.c b/modules/video_filter/deinterlace/merge.c index 0baa080..b6fb619 100644 --- 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) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
