aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-07 13:14:34 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-07 13:14:34 +0100
commitee884c30233856b69fb87345944b4cdfe666fc0f (patch)
tree507ca8737235989a0a391ce70c13d6c540e5e55c /libavformat
parent9ecccd6e5a21e3d9091a9e8dd40221b6812cb17e (diff)
downloadffmpeg-ee884c30233856b69fb87345944b4cdfe666fc0f.tar.gz
Fix OOM error condition in idcin demuxer.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/idcin.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 878378febd..57f81c813d 100644
--- a/libavformat/idcin.c
+++ b/libavformat/idcin.c
@@ -266,8 +266,8 @@ static int idcin_read_packet(AVFormatContext *s,
pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
AVPALETTE_SIZE);
- if (ret < 0)
- return ret;
+ if (!pal)
+ return AVERROR(ENOMEM);
memcpy(pal, palette, AVPALETTE_SIZE);
}
pkt->stream_index = idcin->video_stream_index;