From patchwork Mon Dec 27 00:26:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 32921 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp9884634iog; Sun, 26 Dec 2021 16:26:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIc9wlWfTWw5kcQg/uqNDHmTM6fkRAVNsvU359ilVG2ylmshl62KQqJ7mlKMN3Nv8yP1Dz X-Received: by 2002:a17:907:6eac:: with SMTP id sh44mr12145937ejc.507.1640564801558; Sun, 26 Dec 2021 16:26:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640564801; cv=none; d=google.com; s=arc-20160816; b=aNCjbjTkNhrWWYm43bx02fwpLSn0FFe0hBsYQ9I3myzXyHuvWhOiONY+EntiQhE2o1 rS8kFqrQC22X+QNb21DmcciZ+3HddwOVcSxkyJzG/D/9OmlOvP/7MH05s6cNtl5c1V6b k+Imysx+4rQeJRIuxCIhC0V8Cvf/i6IM9iysZVGCajR4eNOwar5yuzLVYPdFcUxjYXew nqzmUk8s8KL0jhRX8KJFZ46HolJ32fGutnmUjIvj0X4UpdM6fF954sJ+6QkiSyorbVGv SOehTr/kdIRUiGGdkaSuXTF7u9CSjk3F++tg8zh3wXlFb8dbse+P0NVsxNWPSsRfnEO1 uOQw== 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:message-id:date:to:from :delivered-to; bh=9OED8EhOThmM5HmAl2YGL/7/Z/VpsdIu24BWxz+/vwE=; b=MYK4IjxQYBrh8x13/NJ9C5oSZAdodvvkigPg1fO0c+AZr5vsunEYnf557iZHJXWTNu sDXfbFxLKCEnV5YiB4pC9RzrzBTCADURmAQSVWNXczI0k4p3ngR9Ek3h5tCcONEQygtP bih1QBTJS+nOG7++soKGntcKeieDvfs4iL54r3H7CpoZRaFuIAq1u5n3pYtCA/Lg5BGt ay4hW0OGQ5sHJeqrMUGjx3Bt+EkccejWOiMzJzbuq5Fsl1SuNKPbJf9B1szgsRwoJ04F IpJsJ5bmuWtnHRIcC91waPB0AkpjYFhI9yuc+Crw8jIPTagtgJd/jlDQFF/6BXHQCGDj ENBw== 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 hw19si5978741ejc.958.2021.12.26.16.26.33; Sun, 26 Dec 2021 16:26:41 -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 D4F8668B009; Mon, 27 Dec 2021 02:26:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F62968A8E7 for ; Mon, 27 Dec 2021 02:26:22 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 49C72E6634; Mon, 27 Dec 2021 01:26:21 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JgX5Bsyq-IQ2; Mon, 27 Dec 2021 01:26:19 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 4DB86E6631; Mon, 27 Dec 2021 01:26:19 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Dec 2021 01:26:09 +0100 Message-Id: <20211227002613.25069-1-cus@passwd.hu> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/aviobuf: set AVIOContext->error on bprint buffer ENOMEM 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 Cc: Marton Balint Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7Vs+M3bD0DJF This makes sure the error condition is kept in AVIOContext even if the user does not check the return value of avio_read_to_bprint or ff_read_line_to_bprint. Signed-off-by: Marton Balint --- libavformat/aviobuf.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 29d4bd7510..6f8a822ee3 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -875,8 +875,10 @@ static int64_t read_string_to_bprint_overwrite(AVIOContext *s, AVBPrint *bp, if (ret < 0) return ret; - if (!av_bprint_is_complete(bp)) + if (!av_bprint_is_complete(bp)) { + s->error = AVERROR(ENOMEM); return AVERROR(ENOMEM); + } return bp->len; } @@ -1351,8 +1353,10 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) if (ret <= 0) return ret; av_bprint_append_data(pb, buf, ret); - if (!av_bprint_is_complete(pb)) + if (!av_bprint_is_complete(pb)) { + h->error = AVERROR(ENOMEM); return AVERROR(ENOMEM); + } max_size -= ret; } return 0;