[SCM] libav/experimental: vorbisdec: Return AVERROR(ENOMEM) on malloc() failure.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:13:28 UTC 2013
The following commit has been merged in the experimental branch:
commit 55aa55f2e16a052015df70bdff66067500c8e56d
Author: Alex Converse <alex.converse at gmail.com>
Date: Tue Aug 3 00:27:54 2010 +0000
vorbisdec: Return AVERROR(ENOMEM) on malloc() failure.
This is especially important because classifs can be very large.
Originally committed as revision 24676 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index b543f5c..19f7e1e 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -667,6 +667,8 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
res_setup->classifs = av_malloc(res_setup->ptns_to_read *
vc->audio_channels *
sizeof(*res_setup->classifs));
+ if (!res_setup->classifs)
+ return AVERROR(ENOMEM);
AV_DEBUG(" begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
res_setup->classifications, res_setup->classbook);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list