From 3632f35c8e163f6aa6d63c317e3e1fca6a4a5fab Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 11 Oct 2012 19:37:25 +0000 Subject: bethsoftvid: check return value of av_packet_new_side_data() Fixes null pointer dereference, fixes CID733777. Signed-off-by: Paul B Mahol --- libavformat/bethsoftvid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/bethsoftvid.c') diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 1a83c797f7..191f02944e 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -187,7 +187,8 @@ 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); - memcpy(pdata, vid->palette, BVID_PALETTE_SIZE); + if (pdata) + memcpy(pdata, vid->palette, BVID_PALETTE_SIZE); av_freep(&vid->palette); } -- cgit v1.2.3