From patchwork Sun Nov 27 17:03:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6959638pzb; Sun, 27 Nov 2022 09:06:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf6FmJjMYnbOZ0IQnZssIv/wCiaD3R3OYcxL6E/pM5Tmx1WWRVtEjxqryEIVyf5bAzDcvRD8 X-Received: by 2002:a17:906:6153:b0:7ad:b51d:39d0 with SMTP id p19-20020a170906615300b007adb51d39d0mr39125000ejl.571.1669568811778; Sun, 27 Nov 2022 09:06:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669568811; cv=none; d=google.com; s=arc-20160816; b=fTAyQsw+BTAiAzFpAQNsWVGNICQ1fi0OkSq5XefZYCfAIiisfR02OOJ+mSb0VgqHhH jMvuARSJf9zOCl3vv2aRgCmTlvmvW1F8ykhlcXOlv/TOfuFsMrLbrvHnNYhES3OslUQF eCjn9muENCwjyuwOWN7XC1UjOahFp4ENrCaUDbNBUUNao8l8s5G+ZqaxgLMEqiHNCGPM YNLsuBrP53xcdqGlDFUctLbuEGUpJ/ZThoyiqVtDgYYcUOG23Q5JcPu4TQVedY83St2W DudUzfG6j1iYQmMAv39SEZrWgt0hilIBu1C4/CydiRbdlGlYDQ8b3cvPSRKVLS2zOzpE Oshw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=bRjPxfsBk/z2WvIKWHB5N4nDlkxzl4EuoReVSofrKLo=; b=zX4FlCsRJ4LZTQVbYIAPfhaaWoOINAtBFF2DR8H+GNA9YGmf+YWqQt5u3QgI+x/peA YPXAC2b7WpsQL9quClO9680So0KYuKPsIYIuQqE2qcQX9dyJtYE3ktLUMXzf3+nZQAwp tgMofdVrP/wG4HAhaDBMg5AbcpgGSa5BocabyFvqyzH68/T/mMmmSJG6WuK6adwQyQI2 actwatce65itLLLUmKQ3BcQFu6cv6Jy6FrAZyqkS+xxf1oxgATghFLe0PNlyGWo9si+p CQszPRvzGvf0CAiSwFyeV8qUAKWwRAkVacHS/Y+LVKT0G6dqAFgEcnKBAyGjen2wEUG+ h6DA== 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 k30-20020a508ade000000b00465f6a9fbb3si7642614edk.155.2022.11.27.09.06.51; Sun, 27 Nov 2022 09:06:51 -0800 (PST) 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 544A068BA05; Sun, 27 Nov 2022 19:06:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57E4268B6F0 for ; Sun, 27 Nov 2022 19:05:59 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B55222406D0 for ; Sun, 27 Nov 2022 18:05:57 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id rNIWx9Mk0mN0 for ; Sun, 27 Nov 2022 18:05:56 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C907D2406CF for ; Sun, 27 Nov 2022 18:05:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 187223A217F for ; Sun, 27 Nov 2022 18:05:46 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Nov 2022 18:03:28 +0100 Message-Id: <20221127170351.11477-7-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221127170351.11477-1-anton@khirnov.net> References: <20221127170351.11477-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/30] lavc/libx264: do not ignore memory allocation errors 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YGY0FAWe5QOy --- libavcodec/libx264.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index f776d65588..8b4b986f12 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -468,21 +468,22 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, size_t sei_size; ret = ff_alloc_a53_sei(frame, 0, &sei_data, &sei_size); - if (ret < 0) { - av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - } else if (sei_data) { + if (ret < 0) + goto fail; + + if (sei_data) { pic->extra_sei.payloads = av_mallocz(sizeof(pic->extra_sei.payloads[0])); if (pic->extra_sei.payloads == NULL) { - av_log(ctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - av_free(sei_data); - } else { + ret = AVERROR(ENOMEM); + goto fail; + } + pic->extra_sei.sei_free = av_free; pic->extra_sei.payloads[0].payload_size = sei_size; pic->extra_sei.payloads[0].payload = sei_data; pic->extra_sei.num_payloads = 1; pic->extra_sei.payloads[0].payload_type = 4; - } } }