From e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 24 Oct 2014 13:15:34 +0100
Subject: bethsoftvid: check return value and clean memory

CC: libav-stable@libav.org
Bug-Id: CID 733777
---
 libavformat/bethsoftvid.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libavformat/bethsoftvid.c')

diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index 120e145a76..85abf2515b 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -189,6 +189,10 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt,
     if (vid->palette) {
         uint8_t *pdata = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
                                                  BVID_PALETTE_SIZE);
+        if (!pdata) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
+        }
         memcpy(pdata, vid->palette, BVID_PALETTE_SIZE);
         av_freep(&vid->palette);
     }
-- 
cgit v1.2.3