[FFmpeg-cvslog] Fix OOM error condition in idcin demuxer.
Carl Eugen Hoyos
git at videolan.org
Sat Jan 7 13:14:43 CET 2012
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Jan 7 13:14:34 2012 +0100| [ee884c30233856b69fb87345944b4cdfe666fc0f] | committer: Carl Eugen Hoyos
Fix OOM error condition in idcin demuxer.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee884c30233856b69fb87345944b4cdfe666fc0f
---
libavformat/idcin.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 878378f..57f81c8 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;
More information about the ffmpeg-cvslog
mailing list