buffer: fix av_buffer_realloc() when the data is offset wrt buffer start

Message ID 20160803091253.0A9E85DA92@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau Aug. 3, 2016, 9:12 a.m.
Module: libav
Branch: master
Commit: 24a362569bff1d4161742fffaca80a4a4428be8a

Author:    Anton Khirnov <anton@khirnov.net>
Committer: Anton Khirnov <anton@khirnov.net>
Date:      Tue Aug  2 21:16:44 2016 +0200

buffer: fix av_buffer_realloc() when the data is offset wrt buffer start

In such a case behave as if the buffer was not reallocatable -- allocate a
new one and copy the data (preserving just the part described by the
reference passed to av_buffer_realloc).

CC: libav-stable@libav.org
Reported-By: wm4 <nfxjfg@googlemail.com>

---

 libavutil/buffer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/libavutil/buffer.c b/libavutil/buffer.c
index 6681002..49a1f2d 100644
--- a/libavutil/buffer.c
+++ b/libavutil/buffer.c
@@ -170,7 +170,7 @@  int av_buffer_realloc(AVBufferRef **pbuf, int size)
         return 0;
 
     if (!(buf->buffer->flags & BUFFER_FLAG_REALLOCATABLE) ||
-        !av_buffer_is_writable(buf)) {
+        !av_buffer_is_writable(buf) || buf->data != buf->buffer->data) {
         /* cannot realloc, allocate a new reallocable buffer and copy data */
         AVBufferRef *new = NULL;