[FFmpeg-devel] [PATCH] truemotion2: check return value of av_malloc(z)
Paul B Mahol
onemda at gmail.com
Wed Aug 28 18:58:13 CEST 2013
Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
libavcodec/truemotion2.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 6c119ac..e083171 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -173,6 +173,11 @@ static int tm2_build_huff_table(TM2Context *ctx, TM2Codes *code)
huff.bits = av_mallocz(huff.max_num * sizeof(uint32_t));
huff.lens = av_mallocz(huff.max_num * sizeof(int));
+ if (!huff.nums || !huff.bits || !huff.lens) {
+ res = AVERROR(ENOMEM);
+ goto fail;
+ }
+
res = tm2_read_tree(ctx, 0, 0, &huff);
if (huff.num != huff.max_num) {
@@ -194,10 +199,15 @@ static int tm2_build_huff_table(TM2Context *ctx, TM2Codes *code)
code->bits = huff.max_bits;
code->length = huff.max_num;
code->recode = av_malloc(code->length * sizeof(int));
+ if (!code->recode) {
+ res = AVERROR(ENOMEM);
+ goto fail;
+ }
for (i = 0; i < code->length; i++)
code->recode[i] = huff.nums[i];
}
}
+fail:
/* free allocated memory */
av_free(huff.nums);
av_free(huff.bits);
--
1.7.11.2
More information about the ffmpeg-devel
mailing list