[SCM] libav/experimental: oggenc: check for failed av_mallocz()
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:48:05 UTC 2013
The following commit has been merged in the experimental branch:
commit e9a32230c3e05deff257cbfa1e5e3d86dc0e94e6
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date: Sun Jun 21 20:13:54 2009 +0000
oggenc: check for failed av_mallocz()
Originally committed as revision 19245 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index bbbee0a..efd57e4 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -95,6 +95,8 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
oggstream->header_len[0] = 51;
oggstream->header[0] = av_mallocz(51); // per ogg flac specs
p = oggstream->header[0];
+ if (!p)
+ return AVERROR_NOMEM;
bytestream_put_byte(&p, 0x7F);
bytestream_put_buffer(&p, "FLAC", 4);
bytestream_put_byte(&p, 1); // major version
@@ -107,6 +109,8 @@ static int ogg_build_flac_headers(AVCodecContext *avctx,
oggstream->header_len[1] = 1+3+4+strlen(vendor)+4;
oggstream->header[1] = av_mallocz(oggstream->header_len[1]);
p = oggstream->header[1];
+ if (!p)
+ return AVERROR_NOMEM;
bytestream_put_byte(&p, 0x84); // last metadata block and vorbis comment
bytestream_put_be24(&p, oggstream->header_len[1] - 4);
bytestream_put_le32(&p, strlen(vendor));
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list