From patchwork Mon Jul 5 20:24:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28787 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4467156ios; Mon, 5 Jul 2021 13:32:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmXFjHVtTMT84i2+Ql8iLMMcgEWTZtM+ivQgXL1yIDE3duwBJgswgP9QSAXS9lMWNR4/wI X-Received: by 2002:aa7:d78b:: with SMTP id s11mr18059618edq.280.1625517179350; Mon, 05 Jul 2021 13:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625517179; cv=none; d=google.com; s=arc-20160816; b=CGGtXMw4EGCx2elnQ2S9XDajjZL96HFhv2wGOaBtEcgRnM7U6/wifxJkPbpx91IAL/ 0cpSSC3/w1DzM732gRiuuXp+tqd8F/A0BYL+mFakMdgQUoiH87Mfy1PQmL0RNYShDvZA epnxhlx77MNEdd8DqyYbXEW1eEUrBOJHH/PidiIhqW3RJ24hAxnUnPUCxOvItdzUK/pd rjWbu91HRSXUePv8VAS6oWvH8RrCSXAvbbaSB/lHwyA1tBA9MRaFLHWxWsxUBLZApndz J7fFZqfh9o0Cw8nJYo4OlWTVt1+3I6UjnCtipD1igdTKcOnXdfPQCjYBqWmVyeYCJCvr l8VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=WOfNsF01bJfqSs8huAmeyx06CIiWA4hbp4SNHkj3tNo=; b=ojl+xVbCRkOl3urCgJA34JGciYX3wSNy1hBEUuWhqSJqSz/jih0EccGBpVPyXT5wEj CyoDTKmS8RRMQjSVJD71d1pQc3jQacZD0pWJq3Mf7TItYHYl06WL+z3vQg/MN+3dq/by Le6msEy+jJnvjyoRZ3v36aDS8dHpF+giu+cDKxzEopZRFUGRaa3DWL1Yaop306YUeaad zgpy7dvuoEUJBm5bKJtIBdvAESFnhIK3zlW64NCWIcHpuOXmGh+M8HCW/tyEtha19T84 sIMaPkBLEAC4iz64mr2Tad/UrANP9vD4tmyeoWgTR40TCVi8kX4vBVpcxBodexKNkpCP QkeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id go44si4885466ejc.266.2021.07.05.13.32.58; Mon, 05 Jul 2021 13:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B697C68A656; Mon, 5 Jul 2021 23:32:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1997D6800BE for ; Mon, 5 Jul 2021 23:32:48 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1m0VAB-004X6o-0D for ffmpeg-devel@ffmpeg.org; Mon, 05 Jul 2021 22:25:55 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 0V9DmMconljeH0V9DmYU44; Mon, 05 Jul 2021 22:24:55 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=yA0bvFAzHGmTXyr9Sf0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 5 Jul 2021 22:24:54 +0200 Message-Id: <20210705202454.31652-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfIMcx5dtDxeq+TA5Yo9uFDKDgZZhsmDYgX1w8UyTJUOdpNIYH+CEyRR8Pwo6DkmVvypxen0VU61gyZCOopmeh+vgBRMf7ZwjMz8WCf8N8OtifCbXIheK k6pHbfyLQ1S/G8FHKfQjdo04CDNUA2sUPc95iNcybGAvZ48PVpIs1LKA Subject: [FFmpeg-devel] [PATCH] avcodec/aacdec_template: Avoid some invalid values to be set by decode_audio_specific_config_gb() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wIWpoG2AIgsu Fixes: NULL pointer dereference Fixes: decode_spectrum_and_dequant.mp4 Found-by: Rafael Dutra Signed-off-by: Michael Niedermayer --- libavcodec/aacdec_template.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index d78e60ec2e..85a2d1c7b6 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1076,14 +1076,18 @@ static int decode_audio_specific_config_gb(AACContext *ac, { int i, ret; GetBitContext gbc = *gb; + MPEG4AudioConfig m4ac_bak = *m4ac; - if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension, avctx)) < 0) + if ((i = ff_mpeg4audio_get_config_gb(m4ac, &gbc, sync_extension, avctx)) < 0) { + *m4ac = m4ac_bak; return AVERROR_INVALIDDATA; + } if (m4ac->sampling_index > 12) { av_log(avctx, AV_LOG_ERROR, "invalid sampling rate index %d\n", m4ac->sampling_index); + *m4ac = m4ac_bak; return AVERROR_INVALIDDATA; } if (m4ac->object_type == AOT_ER_AAC_LD && @@ -1091,6 +1095,7 @@ static int decode_audio_specific_config_gb(AACContext *ac, av_log(avctx, AV_LOG_ERROR, "invalid low delay sampling rate index %d\n", m4ac->sampling_index); + *m4ac = m4ac_bak; return AVERROR_INVALIDDATA; }