From a09bb3ba5e018b81a659c199a84cd1d80c07d869 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 5 Dec 2011 15:38:10 +0000 Subject: lavc: avoid invalid memcpy() in avcodec_default_release_buffer() When the buf and last pointers are equal, the FFSWAP() results in an invalid call to memcpy() with same source and destination on some targets. Although assigning a struct to itself is valid C99, gcc does not check for this before calling memcpy(). See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=32667 Signed-off-by: Mans Rullgard --- libavcodec/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/utils.c') diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 04909cf959..68fc525184 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -509,7 +509,8 @@ void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic){ avci->buffer_count--; last = &avci->buffer[avci->buffer_count]; - FFSWAP(InternalBuffer, *buf, *last); + if (buf != last) + FFSWAP(InternalBuffer, *buf, *last); } for (i = 0; i < AV_NUM_DATA_POINTERS; i++) { -- cgit v1.2.3