From patchwork Sun Sep 13 13:38:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22338 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id CA75F449D68 for ; Sun, 13 Sep 2020 16:39:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A928E68BBAD; Sun, 13 Sep 2020 16:39:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1101E68BB8A for ; Sun, 13 Sep 2020 16:39:10 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id e23so19559006eja.3 for ; Sun, 13 Sep 2020 06:39:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=PQaA6Vq16qD5URnP3/P67v3udhE1JQHoNPS2l9cM39E=; b=cVhknUlQHZplLXIDNGZc1g43pDFNPrGXokGmA8p1f21LTHdzTZxdGmMpfLuPrzlqVH XA72NrJccnmQwUwcl/baw0CGnllKDe24HoyhZpdIlAUKqCezayxyVUIposN6Dfe19OcJ W88z6tWZ1+SCLr+J+TFUL+VJLMVjVKBi2i2Pr5ZQys43DWdSNM9UjRWpYRK/vc6hTCjs mniWrRev/ABwDjxhEe8M2oYvQseXLrUBEsNNlORVa2bR5bPVMI5+Rly+VQNgmZn4mTMg AagSDfDssWHbTKk/JfOQ1LmVs7qV/QzGemtiFXX7FfIXIZUjOiuO/7sF5pOwxUUPiU5C gMag== 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; bh=PQaA6Vq16qD5URnP3/P67v3udhE1JQHoNPS2l9cM39E=; b=rpA9IHT8BjWAIF3BZFk5bRqKG7SJpad7+9osrOIJ0zeulSYORKdXoS15i9RKkd0gPF 2xq0zPAJjlIlWGoqniS2UoU8LQd37WWv5N3PrUNGgMYnC/Uq/SltZeMDInCFtzMe+kmr reKAhPXjI0pe7FHkx6U+IKEOzbp+6rHQODx3OAbj3vSsnKSEMXhStLJ6BC9HBoY1f1Mm VFtR3vUecKloklj55dvtvmucaeUnftFgIweUV9waiat7PYES/CdtQSNwyCpkDFHAusNx xGgsfVNMJMOz0G6Rs5kcNbv4uvZviYd2UNXN1j9BZ2ukJFn23v1ZYw1Ze6bTBuD4maIl qpUQ== X-Gm-Message-State: AOAM530hYSBqmGApYXkwH1MEYN8qg8zHJfGsryythRSBM5VDaB1rrUgQ iMqcAxQlGBud0s8TI03nu4THDX3IaVQnQQ== X-Google-Smtp-Source: ABdhPJz97omB0V5H45lFNM2Z/aBnvp6VoyVF4L2hJ6EG/EQfIfO+Aqil0IHA5ipe8IWCFq0dc4Yfpg== X-Received: by 2002:a17:906:358c:: with SMTP id o12mr10035235ejb.406.1600004349314; Sun, 13 Sep 2020 06:39:09 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id bn14sm5374242ejb.115.2020.09.13.06.39.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 06:39:08 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 15:38:56 +0200 Message-Id: <20200913133856.1411-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/avf_concat: check for possible integer overflow X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There is nothing much currently that can be done to recover from this situation so just return AVERROR_BUG error code. Signed-off-by: Paul B Mahol --- libavfilter/avf_concat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 5608ed9ac6..295a340515 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -251,6 +251,8 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no, if (!rate_tb.den) return AVERROR_BUG; + if (seg_delta < -cat->in[in_no].pts) + return AVERROR_BUG; nb_samples = av_rescale_q(seg_delta - cat->in[in_no].pts, outlink->time_base, rate_tb); frame_nb_samples = FFMAX(9600, rate_tb.den / 5); /* arbitrary */