Module: libav
Branch: release/11
Commit: d04108f01147a11cd8aba673e438421687f18727

Author:    Vittorio Giovara <[email protected]>
Committer: Anton Khirnov <[email protected]>
Date:      Mon Feb  2 20:53:51 2015 +0100

avpacket: Check buffer reference

CC: [email protected]
Bug-Id: CID 1267889
(cherry picked from commit fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc)
Signed-off-by: Anton Khirnov <[email protected]>

---

 libavcodec/avpacket.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 25eabdb..557258d 100644
--- a/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@ -365,8 +365,13 @@ int av_packet_ref(AVPacket *dst, AVPacket *src)
         if (ret < 0)
             goto fail;
         memcpy(dst->buf->data, src->data, src->size);
-    } else
+    } else {
         dst->buf = av_buffer_ref(src->buf);
+        if (!dst->buf) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
+    }
 
     dst->size = src->size;
     dst->data = dst->buf->data;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to