[FFmpeg-devel] [PATCH] avfilter/af_join: Don't use memcpy for overlapping regions

* [FFmpeg-devel] [PATCH] avfilter/af_join: Don't use memcpy for overlapping regions
@ 2022-03-15 15:01 Andreas Rheinhardt
  2022-03-15 15:08 ` Paul B Mahol
  0 siblings, 1 reply; 2+ messages in thread
From: Andreas Rheinhardt @ 2022-03-15 15:01 UTC (permalink / raw)
  To: ffmpeg-devel; +Cc: Andreas Rheinhardt

Reported by ASAN as memcpy-param-overlap when running
the filter-join FATE-test.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavfilter/af_join.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index 3e272d9161..6f01c6f70a 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -252,8 +252,8 @@ typedef struct ChannelList {
 static enum AVChannel channel_list_pop(ChannelList *chl, int idx)
 {
     enum AVChannel ret = chl->ch[idx];
-    memcpy(chl->ch + idx, chl->ch + idx + 1,
-           (chl->nb_ch - idx - 1) * sizeof(*chl->ch));
+    memmove(chl->ch + idx, chl->ch + idx + 1,
+            (chl->nb_ch - idx - 1) * sizeof(*chl->ch));
     chl->nb_ch--;
     return ret;
 }
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

^ permalink raw reply	[flat|nested] 2+ messages in thread