From aa1a1b2496cf3ca817e78e27bd0262a50adb91a1 Mon Sep 17 00:00:00 2001
From: Himangi Saraogi <himangi774@gmail.com>
Date: Thu, 2 Apr 2015 01:03:04 +0530
Subject: [PATCH] avconv: Avoid theoretical NULL dereferences
Bug-Id: CID 1292519
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
---
avconv.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/avconv.c b/avconv.c
index fc02c050557..1ad6e5e5de6 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2106,17 +2106,22 @@ static int transcode_init(void)
const char *in_codec_name = "?";
const char *encoder_name = "?";
const char *out_codec_name = "?";
+ const AVCodecDescriptor *desc;
if (in_codec) {
decoder_name = in_codec->name;
- in_codec_name = avcodec_descriptor_get(in_codec->id)->name;
+ desc = avcodec_descriptor_get(in_codec->id);
+ if (desc)
+ in_codec_name = desc->name;
if (!strcmp(decoder_name, in_codec_name))
decoder_name = "native";
}
if (out_codec) {
encoder_name = out_codec->name;
- out_codec_name = avcodec_descriptor_get(out_codec->id)->name;
+ desc = avcodec_descriptor_get(out_codec->id);
+ if (desc)
+ out_codec_name = desc->name;
if (!strcmp(encoder_name, out_codec_name))
encoder_name = "native";
}
--
GitLab