From patchwork Tue Sep 15 07:39:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22420 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c650:0:0:0:0:0 with SMTP id k77csp1677984ybf; Tue, 15 Sep 2020 00:44:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwk7OlWVDDkiA6WMZHU7Lq6Si3zaIvSEQgtw1mFFMm6J50OzwPumtfgJRHM34Ynb9MKivJH X-Received: by 2002:adf:fa52:: with SMTP id y18mr20180774wrr.264.1600155854801; Tue, 15 Sep 2020 00:44:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600155854; cv=none; d=google.com; s=arc-20160816; b=uDD7ukpqZid5bbatN3gYW3mIf6pRZvLgOrb7t7U45PkSvfYTBrBBTeM+sgxToceDwz ZRNf37GJopuv4nCtm0dPtVJrXbrH6JHATKHkYTD+n1NpNvzbV/wMZj6mhjzUjQbBElvM MzDUdwiJZiVHzq0wmdqgAuRipK3DguwiX03jOeYTPP/vEWd7jpbn7/CMUoizubOBXQCs 45mTDpmKoNdawSL/PpLKu2UKWLfFZooY+gi8reWMg1CRcrGBssfBy1s4Fr/VNeAfi4Ba ZhdTJgwVRzw5fijq0G1RoFzntVDmHlrE81RVW74wXmQvaYpZ2neuGofHIzjOVrn9HQcy ipUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=rFH0y9hn0y7/fcOuJC5t9oNJd06IrCW2OSbRJgebUbU=; b=jL6DBZBgBFCZ/BCJI50vFehpjXs/D8PPMZ+saBIvHP2wO5STgeLyAIpm6wQ1qULJay FVBUTy4XP3M8Niyjo9qzLrTV9iDt9Lmp0tvH6DBJgUCYiColi1fOFaqLaa65y0kokavl 8XZ0bFdkRmhlo2V8opLW0iK/mp03Rnh+9kScGQdOAKDVjKMAcpTH2vWgqzuQ4wa0jS72 n006moHLHUAnwFT+OGqsmxvKuxvJJ+8dVf0TymZ5eTvQ1cJFnVwM7D2KiaUUu6Z7oN4L i6tN9A3cpC33FO/ysBX8un4qE9yPshB1FbRbL4iUKvIPw/COSAVIW98nZC5LdGTL0sPW x+5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jS+MeeJR; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b5si12900282wru.248.2020.09.15.00.44.14; Tue, 15 Sep 2020 00:44:14 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=jS+MeeJR; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E95268B914; Tue, 15 Sep 2020 10:41:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D75468BC75 for ; Tue, 15 Sep 2020 10:40:54 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id k18so2346821wmj.5 for ; Tue, 15 Sep 2020 00:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FghuAMd01Sf17GPBGg+nB/kVAzaIuKgBgi6OyG2vDcM=; b=jS+MeeJRucuxq9Lqel3C1kxT8W7F3IIhlNsDdp5aAyOQu8a/1dNLtrD/4/Osq1mrHk mFvDu2xoVFla58jXV7J4kESUq47iBK9UFewkQNcsoyHOwu2Vfujn8iA0OUU3yMtCBRRP qxdB75ixc96vkUf3LHqKxA/ppkVmEvMNOH+eNHNMRw6C2Xjf/F89DnnONJZUNpdTKw+n Gjma+Kn2a6AlOmdwS0db1FaZnYi9EgNEkrD5mTiCTkeLbR0V5/3v6k/YtD0ZbTO+nviN 8nwalOOzh2nO7lzUHcxDez5yd+1UKbLcXQ1vJCmgjbDZqfswwCbO8hbWRpytTrRbRnJ+ tItQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FghuAMd01Sf17GPBGg+nB/kVAzaIuKgBgi6OyG2vDcM=; b=tVhJyCrAngIntOt+8YseToSfUDHnTyYG9ctIrhj17DOpJ2f1jeB7zbvfd63OoMVkI7 99HtvUMyLX71axoGx+v5NG+Ip223Iz+4WC/S+lQELdM7gEnCsYQlCawkFvb6SjGus+l1 jJswNjlqy/s0h2UBb/Citrf0n9m26+PrDpkb/8ovY0Y2+tQ00yRwxDbrXpbf+ex2Qm5G mQi1j64DrzPtZ8czY2c/Owr54uuRMecmWCOYLDljxFhtcMJnQhvCB1L9z/mToLsQN4uJ Z5Lv8N8Nqr1Q3RC/MVnslzVojRWoXUnHXNvoL9YKHy3GKERJ3gTUK6jVtpHtTqgzblwp R5Hw== X-Gm-Message-State: AOAM533yeIEwn77A06x0rCqe4iP7DnJcl9Ww3yxbl73hkXv0z1MAyQ6A EnbcwLSe/kR2KaB/+SWj5dCbB6VK71Q= X-Received: by 2002:a1c:5f46:: with SMTP id t67mr3178069wmb.71.1600155653298; Tue, 15 Sep 2020 00:40:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:57 +0200 Message-Id: <20200915074000.102622-27-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 27/30] avcodec/mpegaudiodec_template: Check return value of subdecoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UBy0l0u2OYpC Content-Length: 2144 After all, allocating an AVFloatDSPContext might have failed. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegaudiodec_template.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index de10f71e7b..98759b8e01 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -1885,7 +1885,7 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx) { MP3On4DecodeContext *s = avctx->priv_data; MPEG4AudioConfig cfg; - int i; + int i, ret; if ((avctx->extradata_size < 2) || !avctx->extradata) { av_log(avctx, AV_LOG_ERROR, "Codec extradata missing or too short.\n"); @@ -1919,9 +1919,13 @@ static av_cold int decode_init_mp3on4(AVCodecContext * avctx) goto alloc_fail; // Put decoder context in place to make init_decode() happy avctx->priv_data = s->mp3decctx[0]; - decode_init(avctx); + ret = decode_init(avctx); // Restore mp3on4 context pointer avctx->priv_data = s; + if (ret < 0) { + decode_close_mp3on4(avctx); + return ret; + } s->mp3decctx[0]->adu_mode = 1; // Set adu mode /* Create a separate codec/context for each frame (first is already ok).