diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-12-05 15:38:10 +0000 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-12-11 18:54:28 +0000 |
| commit | a09bb3ba5e018b81a659c199a84cd1d80c07d869 (patch) | |
| tree | b4408b2e54ad6358549ded48fb90b61bc9b0e187 /libavcodec/utils.c | |
| parent | 3383a53e7d0abb9639c3ea3481f0eda9dca61a26 (diff) | |
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 <mans@mansr.com>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
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++) { |