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 3E27E42C20 for ; Fri, 1 Jul 2022 19:31:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E95F68B4F5; Fri, 1 Jul 2022 22:31:09 +0300 (EEST) Received: from mail-oa1-f46.google.com (mail-oa1-f46.google.com [209.85.160.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 59ECA68B4F5 for ; Fri, 1 Jul 2022 22:31:03 +0300 (EEST) Received: by mail-oa1-f46.google.com with SMTP id 586e51a60fabf-1048b8a38bbso4750059fac.12 for ; Fri, 01 Jul 2022 12:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=CNtBp8HvNiAt7O3AJXFGOy0ZHpdtkZ2o0M+bh6bh4b0=; b=mWB1JxswtV0EWEKRyrnoqvpl1SOg1uphaRZnjhx0W+5LVWZ6SOAp8nxCaKmniw9SSk zFaTk61wYFtv/qJfyWoTNwDoBRBOs49U9jRLtiFnZSW/O1Hgz/+ownq+GVRxx36rg7kE oeYAq4L0pVJr/pKZ7N9gw+fpNrrVBg1HEp/QvSQwKaaZrAL80B9BbOOEez/Iy5XDCon9 ClZJ+EpnL5sbZfTQQfcFRWL7wAaF1sixo+namwS3WFWpnVcC4+dL/sH9+/OFM+W0aSDi guWEurXt1POEkXmdgP+yZeqCwuTt4QDlYOjJPXnuQe+y+CQvPA49qvZnbTOhMITVJDdv krbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=CNtBp8HvNiAt7O3AJXFGOy0ZHpdtkZ2o0M+bh6bh4b0=; b=bNAM5hPTkd4bL/0JOdY1f+lBOmlz06oVoGEC5VhUtks+zP1ke0nsgo2xx5sHD39FnJ W5gcBC1MUfGM4Ak3Umq20KFhiO9TQZdT3+pZ/UqtTtcsgzBwVNXgir8tER8sGkHZLzRd HkE7IPZxdGQ5KSpMb3RqCqpBVSRGYkx2vuV3EWe0bzhCiKOVpDMesBTzm+gj2kWSYf7U ROw0DnSD6HCsswuJEIEiJTU7Mk/KM0lLzYcRoBV+BLafn4SmIZ+Xkoqi35UxandW6OlK vQQOqa3nyizuuvpz3nM7LxLh8T9Mm832kuu9LxYK97H4JmAP67Bj30JDZflUFLDJbHoN qbCw== X-Gm-Message-State: AJIora9HsaAIk9K8YfS0/9VIkPrJB4EJCvpDzmrf2CyaxZCj3r3srLs3 3GjLyPZOlFl7YiI+FvGf38Y0enjSEn/bmg== X-Google-Smtp-Source: AGRyM1swlanMdRC0HRnIyLXXYWkWyBzk+kj6XpqDzP4cr/OKYe0Jfdc7atsPxhnMAMbNEJG7imDJvA== X-Received: by 2002:a05:6870:a926:b0:102:820:1277 with SMTP id eq38-20020a056870a92600b0010208201277mr9419325oab.77.1656703860781; Fri, 01 Jul 2022 12:31:00 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id p2-20020a05680811c200b0032e3ffc5513sm11924419oiv.4.2022.07.01.12.30.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Jul 2022 12:30:59 -0700 (PDT) Message-ID: <66a06af2-978e-6152-f0a9-505e842493b8@gmail.com> Date: Fri, 1 Jul 2022 16:30:57 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220701192553.12538-1-michael@niedermayer.cc> From: James Almer In-Reply-To: <20220701192553.12538-1-michael@niedermayer.cc> Subject: Re: [FFmpeg-devel] [PATCH 1/2] avutil/channel_layout: av_channel_layout_describe_bprint: Check for buffer end 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 7/1/2022 4:25 PM, Michael Niedermayer wrote: > Fixes: Timeout printing a billion channels > Fixes: 48099/clusterfuzz-testcase-minimized-ffmpeg_dem_MATROSKA_fuzzer-6754782204788736 > > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg > Signed-off-by: Michael Niedermayer > --- > libavutil/channel_layout.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c > index 21b70173b7..72969eff14 100644 > --- a/libavutil/channel_layout.c > +++ b/libavutil/channel_layout.c > @@ -757,6 +757,10 @@ int av_channel_layout_describe_bprint(const AVChannelLayout *channel_layout, > if (channel_layout->order == AV_CHANNEL_ORDER_CUSTOM && > channel_layout->u.map[i].name[0]) > av_bprintf(bp, "@%s", channel_layout->u.map[i].name); > + > + if (!av_bprint_is_complete(bp)) > + return AVERROR(EINVAL); Should be ENOMEM. LGTM with that change. > + > } > if (channel_layout->nb_channels) { > av_bprintf(bp, ")"); _______________________________________________ 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".