From patchwork Sun Nov 27 17:03:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp6959407pzb; Sun, 27 Nov 2022 09:06:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf4abBtlDsPha1/8ccpzS5Y3pnR2QCR0VmAFKD84GxVtHhnmplIFYyumHpGAou1xfd7jgQVS X-Received: by 2002:a17:906:b34a:b0:755:6595:cd34 with SMTP id cd10-20020a170906b34a00b007556595cd34mr27756268ejb.70.1669568793258; Sun, 27 Nov 2022 09:06:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669568793; cv=none; d=google.com; s=arc-20160816; b=CgNtVAHkRhm9fPTGrbXUrjD2HdOCDTHrWDNqXlIlSl9LZIhJM1WmmbRjqaz8gIoVGZ PRK1U46Alxj+P37SsYusVUELZRdLEqCR5XvK6KSXEPbWt51hm/3EG/o1GBAF1YYhDIxi tGky7ZrOpwTdDoBEmlGw64C4rEa6I4cacIcp/DUPgM/63zZOgh4MkrkqBAF21SSqym4k 7rcoNyCrv1jW+MRktFSBn4ShZdxfjJE8ZsseTl4oY+OcCebVyFeRs6dqmtqaHYmu4gCp yX1CJJslEz1KPkTYTGbsMvWzKu/EggtjU7eLHW8rfXxDsOcLloKkkJL8aVFNswHJeBki 3deg== 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=WHA30TsD/CEwhePBiBz3iTF4Wcw0ZclH40EHGMFtpxU=; b=SCkFJWd5Psfjo+nXkJtWoaixK3lRi32la4RESdsSKbMwLn24d2JoPHw6yw2eiQnekT TdjKwGTyb4eIQCjxj+fHR2WmfPEHpeKyLXMgNDlULfjty0ZnhYNrQ0g6PCOZCOVeVr8B O5AaK1GH36QUDdK4ZKdb/wwdpjxGjCgMOja7bRzj3OnUxdw0ww6ibVBJJsoEh34OOVFE 8qvr6XSDB0l7B1p6n/PDgPYiCt9PMdkEOyfx9RkSTtcN+y5RbgkawzWc8NCDpRQ2zqtk u8UzEOD/AtaAn6tYC2TNPgYamQhIIUpWGA03uRL+v9eeEGnq7bR/ul43+0rwfnrW6L9o vIEA== 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 qf18-20020a1709077f1200b0078e27f2ef4bsi5897527ejc.956.2022.11.27.09.06.32; Sun, 27 Nov 2022 09:06:33 -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 546A068B9E7; Sun, 27 Nov 2022 19:06:02 +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 BA63D68B5E3 for ; Sun, 27 Nov 2022 19:05:53 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8034D240499 for ; Sun, 27 Nov 2022 18:05:53 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id uITYLdx6YtAW for ; Sun, 27 Nov 2022 18:05:53 +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 7FF592405EC 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 0DAB33A1EEC 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:27 +0100 Message-Id: <20221127170351.11477-6-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 06/30] lavc/libx264: unify cleanup in setup_frame() 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: 53xwDduHw4oQ --- libavcodec/libx264.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 1e9ca73cdf..f776d65588 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -489,10 +489,8 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); if (sd) { ret = setup_roi(ctx, pic, bit_depth, frame, sd->data, sd->size); - if (ret < 0) { - free_picture(ctx); - return ret; - } + if (ret < 0) + goto fail; } if (x4->udu_sei) { @@ -504,16 +502,16 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, continue; tmp = av_fast_realloc(sei->payloads, &sei_data_size, (sei->num_payloads + 1) * sizeof(*sei_payload)); if (!tmp) { - free_picture(ctx); - return AVERROR(ENOMEM); + ret = AVERROR(ENOMEM); + goto fail; } sei->payloads = tmp; sei->sei_free = av_free; sei_payload = &sei->payloads[sei->num_payloads]; sei_payload->payload = av_memdup(side_data->data, side_data->size); if (!sei_payload->payload) { - free_picture(ctx); - return AVERROR(ENOMEM); + ret = AVERROR(ENOMEM); + goto fail; } sei_payload->payload_size = side_data->size; sei_payload->payload_type = SEI_TYPE_USER_DATA_UNREGISTERED; @@ -523,6 +521,11 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, *ppic = pic; return 0; + +fail: + free_picture(ctx); + *ppic = NULL; + return ret; } static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,