From b00ce05fc42eb7497880cb177025dc12b3b85d63 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 26 Jan 2022 13:51:15 -0500 Subject: [PATCH] TT#14008 prevent possible NULL dereference closes #1434 Change-Id: I21fa86b0410f86cd6d77951cff75c5eb03da38e9 (cherry picked from commit 1bc15de7468914000558c0606b3ff02a5c8b586e) --- lib/codeclib.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/codeclib.c b/lib/codeclib.c index 3278bad49..885fd68da 100644 --- a/lib/codeclib.c +++ b/lib/codeclib.c @@ -742,6 +742,9 @@ void decoder_close(decoder_t *dec) { static int avc_decoder_input(decoder_t *dec, const str *data, GQueue *out) { + if (!dec->u.avc.avpkt) + return -1; // decoder shut down + const char *err; int av_ret = 0; @@ -2322,6 +2325,8 @@ static int amr_dtx(decoder_t *dec, GQueue *out, int ptime) { static int generic_silence_dtx(decoder_t *dec, GQueue *out, int ptime) { if (dec->dec_out_format.format == -1) return -1; + if (!dec->u.avc.avpkt) + return -1; if (ptime <= 0) ptime = 20;