From patchwork Fri Apr 23 13:48:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27219 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1552219iob; Fri, 23 Apr 2021 06:49:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKONXJZg9CSPp0F5Cz3h3HqH1W1FFgj1CwBEDSg/jpBV63+ddIWVedS2cp7TORRTS2cIfw X-Received: by 2002:aa7:d54c:: with SMTP id u12mr4815033edr.234.1619185779967; Fri, 23 Apr 2021 06:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619185779; cv=none; d=google.com; s=arc-20160816; b=TwA92ElcXLBQbY2DNIbr9xMBRd20b4UrNq0jDXBWs3I6s9eh62U/vMIQbQBoxHH0+P m9TkZSqOdRPaThqW656qhu+X/JVp0U/NqIarAH1J7gr9TED3JvWhIxhw3XQm9qp8FfkJ HBkVTAnOynGqCeRLyIIQbgQEdTf+F5F+NyAETpp0dZdWaXYo7u8kRpDNTFsQZM84vN2v FY/XtagX/CzuVdEzWUeYi396hc8CBcdbg2dwuyyXKeqVk15t5v2DMPhfaihoAtBwcHSc eXJuxoj6hX4F7IrzAGifKPL4+e5OpmwYc5lUs+iaZ1CEBkIHDIArra1yKNYV7xBUlnqC FXaw== 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:dkim-signature:delivered-to; bh=UMUM2WY4tLy+MU13IBmFMNcJbXhlHw0YaU743OCxTHs=; b=TmSBoK3mga7gtPsBJpaua87l8c5Jo536xG36fgpXIKb/+Ci/3/yEMmWDkllOUzAaP4 ccPCIu6bYuo0GJAXNNadt3fVZKxKIUCkJZmNzhXafOuft8wDn66p7XMj6MwAr7wJjdsw 5Ic14cXkr4I0GnYQres1CJ1pZJRxOJmrlLk9LonZVU++iBUYmM+2U+zDbZS15IhwJlUZ 6IiQQ6KO/YpSsp9pE9bYPJ/JLxuF+QnKXC4O5506ishkHj2YV5gdtOse7WuoDPgqxH5I h9AFAf2Q/u24wE1F5JlyuxRK4USAVwraIN7KjyP8HhJq0ZJtv6FXUg2vXKEIsuiDtYtW n17A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hNJTK70s; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m9si5058110edv.444.2021.04.23.06.49.38; Fri, 23 Apr 2021 06:49:39 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hNJTK70s; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1674768993B; Fri, 23 Apr 2021 16:49:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 215DF680273 for ; Fri, 23 Apr 2021 16:49:29 +0300 (EEST) Received: by mail-qk1-f174.google.com with SMTP id v7so21529031qkj.13 for ; Fri, 23 Apr 2021 06:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JCUgdZGA32Mb2hp9/lLFoHFgzJdgHtsWaH4vxnc4OEA=; b=hNJTK70sBpuSt6ZD+TBLgvX/QuMbe7+bTwFTRh1EEBPS5KnDtOjdLjdOPLf89SfxlO h21JhZvYXNyomBUoNIg1gFr2T64pGtx3cfoXB/TnhMuUAv6LxnCMOcSOVn3u8qIiJqtU lyKzBWOsdzHgA6b1Hr5+dFAEupB9RWQflwkQJ7Gl/OnYP1ZKyLtPorAC6MzaX5k32kI8 dmi/F/wR4KKPepFzBEnXojFE5px6RlvJYo9mvpNVYOdy9o0utLJIpUHC4jM9p1uDygu2 RtNtBaEd+73JzUR9NFLs1CDkoqYy1BgpRoMzJT1lLvOy9rxt4wLKBK34/yabF4yRGUFx 6Pvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JCUgdZGA32Mb2hp9/lLFoHFgzJdgHtsWaH4vxnc4OEA=; b=QlOhvbW/QT1MRs5R/yjxzpK2a6hNtrQKGJt9poJWUdBCHteZwJqY5DdzU0VFgDRxUS xYFDFNh6tlBTYcFwSrb37aAqtKJkXYQys4Bx7Uu/6APpCmVSxHCeX+wJGKaD6M0/u0Rs 52SuTpIa0dKx6hE36SH2DJn7lJaBonvj8LC7zwZCR6tiBr1rViZeJyos3RJC1v33xnSX BVVmi0jq2/C3RdzRulnkR2SmnGjdpz1xqUheGXoXxtheTN0sUwbOxIBamyqRKnwGJEnH p1dTeLUJ0gbYOTgcGcwpVqVO9odmBPjmsi6GOYWbvirlgveXDYpfWnh4DW3glyu2+rZf 7yPQ== X-Gm-Message-State: AOAM5334MTrA2CoC66tJNZmWrcFGYdY1Naw+0PEP/M5Q+woyst/X9BZp xMOWtsUAgO5bzDyE5fpnys8FyltiC8I= X-Received: by 2002:a37:8084:: with SMTP id b126mr4075176qkd.175.1619185767643; Fri, 23 Apr 2021 06:49:27 -0700 (PDT) Received: from localhost.localdomain ([191.83.218.38]) by smtp.gmail.com with ESMTPSA id c2sm4375589qkk.2.2021.04.23.06.49.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 06:49:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Apr 2021 10:48:00 -0300 Message-Id: <20210423134800.724-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <561d09c8-94b3-b881-03dc-b0f79e978a52@gyani.pro> References: <561d09c8-94b3-b881-03dc-b0f79e978a52@gyani.pro> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/af_adelay: make per channel delay argument an int64_t 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: 3M5UB8VIQ90C Should fix ticket #9196 Signed-off-by: James Almer --- libavfilter/af_adelay.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c index 6ac81c2a3e..81ff7947f5 100644 --- a/libavfilter/af_adelay.c +++ b/libavfilter/af_adelay.c @@ -28,9 +28,9 @@ #include "internal.h" typedef struct ChanDelay { - int delay; - unsigned delay_index; - unsigned index; + int64_t delay; + size_t delay_index; + size_t index; uint8_t *samples; } ChanDelay; @@ -152,7 +152,7 @@ static int config_input(AVFilterLink *inlink) p = NULL; - ret = av_sscanf(arg, "%d%c", &d->delay, &type); + ret = av_sscanf(arg, "%"SCNd64"%c", &d->delay, &type); if (ret != 2 || type != 'S') { div = type == 's' ? 1.0 : 1000.0; if (av_sscanf(arg, "%f", &delay) != 1) { @@ -194,6 +194,11 @@ static int config_input(AVFilterLink *inlink) if (!d->delay) continue; + if (d->delay > SIZE_MAX) { + av_log(ctx, AV_LOG_ERROR, "Requested delay is too big.\n"); + return AVERROR(EINVAL); + } + d->samples = av_malloc_array(d->delay, s->block_align); if (!d->samples) return AVERROR(ENOMEM);