From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C2D1C4686F for ; Tue, 20 Jun 2023 20:27:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 81C8268C054; Tue, 20 Jun 2023 23:27:06 +0300 (EEST) Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 446416802C0 for ; Tue, 20 Jun 2023 23:27:00 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3a0423ea749so427566b6e.0 for ; Tue, 20 Jun 2023 13:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687292818; x=1689884818; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=tMAgcKZxktDTMEANtOvLhcDxPH+sWcQqHPj5PwL7vWU=; b=CT85gZUIvZdnM8LJzzA0ZmMwIw1psBSLhk64IJNypYJ9wI4k2jAruI0uFzYEi4cEkd FoEdITeY9/71pQVeP/pSxNa6KdqjJsZUbtmfMOXt4Aril/yflN6hj0NyojR8Ms9mKkou kJUUeg5QaACUSWRUE59fC/pvgXrNnXxOzOqL3J36c46MrNbx0Wp9pguaDXz0yoYHPpPl Ld8uoth36Sm/39+ntM3OJuCmEnX16exj05i5ak0h/aea8ZJEYRs4HfIVMpAJnYGyk0b8 5py/Tu7FsC/a5/8yODO67w+UVhPztlvI+iebxCMPuqQms9pxiu+9eDtqg2N7qEcWNcd1 GqPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687292818; x=1689884818; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tMAgcKZxktDTMEANtOvLhcDxPH+sWcQqHPj5PwL7vWU=; b=Yqhv3p/oHY19ce8yI9DPmpjryQpE18VBmI8TDzaS+OUD4o09nPFpXXILwlJ0HclzEA OTBBMsoxHm7GAvCof7/wx5XebhRH0se9r6H7YD/dFz2vuiy44407RItEsVYTbqpYsNPk 4LlF5FsHWkLLbfyBmcNaPqncZofw3UjgMfkVH8T7RLqOchlbNf5YveIK8pDJ3mTeyl/T tcUSYitJIkp2vzue68H1mZbJH/MknjW97BsNj/5/QzhncCv+oka0c9VWyf4CVN/7fni6 QWzCD5oysR2l0m/XV70ADZ8DRqw+QYoOfXaf/qTtBNyt8brqkDAYc/AfBvIPVP+BEfTH snag== X-Gm-Message-State: AC+VfDxP+jWS1006zxkax+KMXNG65KBMP+j3qTTZcQFDVvQ9UhlGeePb /gsXuflpee5/MsG944s1Z7CXxb2SZZU= X-Google-Smtp-Source: ACHHUZ4zc43LZwFaTDvmGJRwBORvaZeY/0OMoM4KfwGipeK1w7YcJ+cfxu+ZaJRPIQiX3gkDiiX08A== X-Received: by 2002:a05:6808:148a:b0:3a0:3ea9:c862 with SMTP id e10-20020a056808148a00b003a03ea9c862mr2550631oiw.46.1687292818106; Tue, 20 Jun 2023 13:26:58 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q19-20020a0568080a9300b0038c0a359e74sm1461617oij.31.2023.06.20.13.26.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 13:26:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 17:26:58 -0300 Message-ID: <20230620202658.10058-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/id3v2: check the return value of avio_close_dyn_buf() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Fixes ticket #10424. Signed-off-by: James Almer --- libavformat/id3v2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index cb31864045..38c86a8e79 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -246,7 +246,7 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, int ret; uint8_t tmp; uint32_t ch = 1; - int left = *maxread; + int left = *maxread, dynsize; unsigned int (*get)(AVIOContext*) = avio_rb16; AVIOContext *dynbuf; @@ -308,7 +308,9 @@ static int decode_str(AVFormatContext *s, AVIOContext *pb, int encoding, if (ch) avio_w8(dynbuf, 0); - avio_close_dyn_buf(dynbuf, dst); + dynsize = avio_close_dyn_buf(dynbuf, dst); + if (dynsize <= 0) + return AVERROR(ENOMEM); *maxread = left; return 0; -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".