From patchwork Sat Jun 5 14:30:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2012901iof; Sat, 5 Jun 2021 07:31:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaY2Wpzg9q5/XoZgxIbiZOPurNSdzMA41/ppJIHckEndxFTg5JvXdDSdK9k6yZwUMMG2nb X-Received: by 2002:a05:6402:1d38:: with SMTP id dh24mr10795746edb.18.1622903484832; Sat, 05 Jun 2021 07:31:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622903484; cv=none; d=google.com; s=arc-20160816; b=PB86a4S4Qron29tg/Fl8Lpfotn/jIgi7C+4xmWb0K6Jlj0QxlI5eiOumkKEgDWnutG nccqTEpbXFwmoyJCwEZpYtXMhWXhk2rBc+l2fR1HDzmNfUYKlonEY6fiFkv6wVfRMTYB V3Y9c7M0aJvoe20DwLCN1K6B6bjHvyAmgIa8DBioUjX1TxMdKj2uVpkXqk4z98apvjFR Vfu60cGiIafK43IeZufsEN2wd8A3Lj+RNPVu+k8AXxptGlECzaD0EU9LXVLa63YHjX1e LPmpDaXMGUNtZGEYt+zs3FtG6wp9jz8lRGA3r/7gimYJG6ZLTtyMYtfBca3/u89BsU7z AP4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=nUMsUfMt/yvcqXeFPOxeZO97oaej7UztcCBtH2dTwmA=; b=Zq1p9owirZzJNueZsl2XwaRx+87xfHYox6gKNctu7XurDLl5gPBH+Ey/6PqSNyxzsd eT5redwosW0ORW2uDexKKltMEA/+ICWYFFopbH+iC71N3ibJf3oW+J1+G/I3K0fJ/ycW 2Nbyc/yftg3emXHkYtajffec2sG8lyfKOKPnOMmqtubfWCNvQrpw+S7F6arOybTk8HFn gajm8BnZ2NkNpWNq3YLiHVF+/gueDNlcso08sMNax5nSZ06APMB7jex5MB1y+qHoMqsr t0HQrHEiAY7d+D25rsKIAa/retQTt4ymBpAcpA+3dtSwp6BL3nwKHhMzqS2d3gEKUP0j lnkg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l21si7210869eja.295.2021.06.05.07.31.24; Sat, 05 Jun 2021 07:31:24 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E97FB68A4BE; Sat, 5 Jun 2021 17:31:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 530B668A486 for ; Sat, 5 Jun 2021 17:31:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lpXKU-00G9zd-06 for ffmpeg-devel@ffmpeg.org; Sat, 05 Jun 2021 16:31:14 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id pXJWlY1LOljeHpXJWl7S0k; Sat, 05 Jun 2021 16:30:14 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=xCxCWkUM3CW3Fgvun9UA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=bWyr8ysk75zN3GCy5bjg:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 5 Jun 2021 16:30:14 +0200 Message-Id: <20210605143014.17686-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLkGtRABdlJd/Y9jTrsTalwOFjoRnnyi6C4z04pIltJ9KkuxwruJZpovs2E5imdepOvTk6cerqSi5CS0ShKw9erms+xkR9ZeuDf5p24ahilc8ZVGgeX0 97VJLClqR8bxCUkAnOT8Ue7VoxcgeqAYYTxQPx24ji1gsXV6KBxK67R1 Subject: [FFmpeg-devel] [PATCH] avformat/jacosubdec: Check for min in t overflow in get_shift() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gG7bHILnZWcu Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself Fixes: 34651/clusterfuzz-testcase-minimized-ffmpeg_dem_JACOSUB_fuzzer-5157941012463616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/jacosubdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index c8bded02fe..1224d35bc4 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -141,6 +141,9 @@ static int get_shift(int timeres, const char *buf) int n = sscanf(buf, "%d"SSEP"%d"SSEP"%d"SSEP"%d", &a, &b, &c, &d); #undef SSEP + if (a == INT_MIN) + return 0; + if (*buf == '-' || a < 0) { sign = -1; a = FFABS(a);