From patchwork Wed Dec 30 23:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24709 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E5C0D44B882 for ; Thu, 31 Dec 2020 01:35:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CA3968AA64; Thu, 31 Dec 2020 01:33:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA2DC68A77B for ; Thu, 31 Dec 2020 01:32:50 +0200 (EET) Received: by mail-ej1-f51.google.com with SMTP id qw4so23657530ejb.12 for ; Wed, 30 Dec 2020 15:32:50 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=yJX69Si4KeZNSECMz3OCzeUYpFjHJAtTb6BEXoCGgog=; b=opF/ZayL5z78S0fXZ4pACid8YpbdyG0Rwp0rlS97Sy921+aP/ybz3HPFAvOZIWAC7T 5tkjNDCqMHqdbbusi3AUGPdw6vHGRGXAfgehXaMcJfZ8qTk5p4Of9ZTsEf7N2AMdvj7B 41qxYioLdC2R+4x/zKGHoQIp1sns97WndKJHAvu1dfKDj37dfbcZH1zwrxozny+lR8xT OGNtiujvy2m+iDpMkgW1Op9o/mYkFzQHi/R1YNBgqrvzSbaDgUpax8gmxTgFnLt48UDr G45apzZHuypqA0pAnGBSvtPWmNixD/KfFQfpzbubYj3cGf1ojwm98mAQpl/LEuAAkWPq mB/g== 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:reply-to:mime-version:content-transfer-encoding; bh=yJX69Si4KeZNSECMz3OCzeUYpFjHJAtTb6BEXoCGgog=; b=q4U4W6g8a0gqLGtqhFnC7Us2/IaxjTk4OXwmEnRZKH+Tcd6m3+iCLc7FwgOxyMplFu G7GhVXBui/Ree/oUyEODAS+C4TXMz+LHNuqV+aq+tEDr6icLevmMpWkxguiGVIzBXVyY 9XPLxu4ZkxCRyQJGtxLMxbz2TDukuRl4jz/gXuDTd+i9GHUl/jkIqr1Ee4owBRlSuu55 Hsm4kP36kSu9yiiLEkQzp4FkI3xUk9tEDLz4VzHWmLvY5O4mFqdJZYaKAZpARDaItvXs iVdASdBi4t3ebx01XRbH1zYnY9wBjgcHt6x3IVeZYw70pLQvre0fcGLvnYsT6RiCZxKU Uunw== X-Gm-Message-State: AOAM533i7DB4wDJNlHV8pVUbedDVgtOxs3FGJ5DB7KT+nYvCycwuOSSu X//YORkvq+FbQ9boQGEJhjA0J1tATEU= X-Google-Smtp-Source: ABdhPJw+ibsZPnTz2ctBbVuD4AR1cIyEkMmagb45Nv7LpyTOIwTnwP4ckqnLG6FKDOcqzUfKxzLzGg== X-Received: by 2002:a17:906:fa8b:: with SMTP id lt11mr51197889ejb.94.1609371170149; Wed, 30 Dec 2020 15:32:50 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id u19sm19630409ejg.16.2020.12.30.15.32.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Dec 2020 15:32:49 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 Dec 2020 00:31:44 +0100 Message-Id: <20201230233157.1055287-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> References: <20201230233157.1055287-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/30] avcodec/opusdec: Return error upon error 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" The Opus decoder forgot to return an error when allocating an SwrContext fails. Signed-off-by: Andreas Rheinhardt --- libavcodec/opusdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c index 86a3181e9d..462d70b3bf 100644 --- a/libavcodec/opusdec.c +++ b/libavcodec/opusdec.c @@ -671,8 +671,10 @@ static av_cold int opus_decode_init(AVCodecContext *avctx) s->fdsp = c->fdsp; s->swr =swr_alloc(); - if (!s->swr) + if (!s->swr) { + ret = AVERROR(ENOMEM); goto fail; + } layout = (s->output_channels == 1) ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO; av_opt_set_int(s->swr, "in_sample_fmt", avctx->sample_fmt, 0);