From patchwork Sun Sep 13 17:49:09 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: 22339 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 ACECB449186 for ; Sun, 13 Sep 2020 20:49:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8CF2968BBEE; Sun, 13 Sep 2020 20:49:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f66.google.com (mail-ed1-f66.google.com [209.85.208.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC67A68BBDA for ; Sun, 13 Sep 2020 20:49:21 +0300 (EEST) Received: by mail-ed1-f66.google.com with SMTP id n22so15400751edt.4 for ; Sun, 13 Sep 2020 10:49:21 -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=8maBmL3yKzKg68NWV8+uJcBsRxrwGYcMo7OeVGjnsK8=; b=sqtx/gc+7maamV7+Z5UomPFMltJORUNscQej2ozot0k/gbTUim3VeWtuX9cDTDGA4l IvUdr/1LwESgGA208dZGXq/L0WlUnU6oT/q0f3RZxKWwt8IAUkG4/uPsr9rjGQFTDX7N oWPIMvIftVzWqbED3JGmUiLDQTy622U5s9jOLoCOYox1J30esaabBqE0tpwOMUCiEq/s +zgpbLWpCar+jKExne7M+hCGNCGaIr5xOJjdsW14cejvQEOKgOKpANcB65hGrATiucdX KYiOZpQUug3fNEykzEfPVb1KDSWMfGJs5mHCTW4yjvV3BSxWENRUCMN/hJzre/498eYo ospw== 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=8maBmL3yKzKg68NWV8+uJcBsRxrwGYcMo7OeVGjnsK8=; b=gTnlcEAZcKzGxqwKc3lE3ngNgLlZt+aN7UsoEmuJ1+La41za82ju7rkjt9PKBxdIfN lmfZyRmlBwmkdGESccrzriSnzDBW+EObO3PteqZUdPIqEuX9rF9lsbzsMCIdH1UBiSuT EaKcALf6fg+bD4QMY7rYh/SteQ8Szo8uwgAGA1FozWyQj0meEPPWycD+6YCSMon6mctX KRmJBr7eKLvBim/jcte+K6xDje5GonWAfjG56mhPUJd0StgN+o8OtHnCAjM2PnVDdGox aDrIKDZJEmP1immyg+6dEQleow0aY3VcmwV03fyfxU8LwX1pknXhIFI6eTXq3oqhUif6 8bNQ== X-Gm-Message-State: AOAM532jmOngJzcuTdqygMPTrRefP5r/efhvgmTOn8ejzAHax8ZIHkyE ZzDLjIkHxvExUzuZn4EFL17cT2OstpzTQQ== X-Google-Smtp-Source: ABdhPJzewtbZemx3DyQCNT7hyKQ4vamQd2VUPisU2xMELT2yAAKTLDnZDH7vY5kFAcCzCZSnvX5laQ== X-Received: by 2002:aa7:c387:: with SMTP id k7mr13412962edq.242.1600019361023; Sun, 13 Sep 2020 10:49:21 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id r9sm5717903eji.111.2020.09.13.10.49.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Sep 2020 10:49:20 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Sep 2020 19:49:09 +0200 Message-Id: <20200913174909.32197-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" Also check that segment delta pts is always bigger than input pts. There is nothing much currently that can be done to recover from this situation so just return AVERROR_INVALIDDATA error code. Signed-off-by: Paul B Mahol --- libavfilter/avf_concat.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 5608ed9ac6..df6414704d 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -251,6 +251,10 @@ static int send_silence(AVFilterContext *ctx, unsigned in_no, unsigned out_no, if (!rate_tb.den) return AVERROR_BUG; + if (cat->in[in_no].pts < INT64_MIN + seg_delta) + return AVERROR_INVALIDDATA; + if (seg_delta < cat->in[in_no].pts) + return AVERROR_INVALIDDATA; 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 */