From patchwork Tue Jun 8 19:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 28175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp172317iol; Tue, 8 Jun 2021 12:37:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx99AImVQEi0rnae2CvTB3m07Nse3TkwFb6c43Rg6mREOuvPSDloLenEQDoFd0tyScURJFw X-Received: by 2002:aa7:c547:: with SMTP id s7mr26845698edr.239.1623181021343; Tue, 08 Jun 2021 12:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623181021; cv=none; d=google.com; s=arc-20160816; b=mFj0rUpGa+dFX5zwR1l1TaW8Pf2oRr12YOjkGtR538Atqr3XRHM1YJvR0DOr3UjZuU hFrvpZDFGJdZ9lsklyTwUQDSTPQBM3aYhgHrzUaSQm7+4n8yCzYuHMKrGO0uN3bWi856 sGJqDtq9s1gM4uNHsF9KJjrB3cQPGgdyPfhgd2Kpajk6fPvCiN+x6ZcIagk+c3hgVQUu BmXS6PvqnFkMNz3+Wjbq1ArfyGYxHJr0kJBfTY1OaifYj1EQTrIuBu1zkwUIU39f9BP9 25VHeoNAZ9OBnCYSA5mO8aF/Xpok8QxzspudgCA4Ign9dCVTpijxRxZCe9XsUPtExb+Y 9Rpg== 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=HlcOjSx7mMb+h+FtxQJEu1vSMgeDUQxiImD5dYpwqz0=; b=Ed3appN3dvEvHPDkqP2UaR61U3VcMmGD2L241F6E2F1uJEhrv+U3ej0l+D4OyuZbbS CrC6dE7Cqvi814zrrMfmIi1qIPxLgcWBqRdFU7xP90CRiV+2RNJrqc3744gYzBHix8lT RohbFhScplr0T1FCZVgHMtA4Aqs3DqdUZmuOdVXriHXHuiIzkiZqMQVDmS5AKuPoFmJY xNeYeIRJhKnRcutaC9N+kfZdJTiUtJLEmvnvlsNjX0vOh4UYa87IOIQTcrtn8OvuVaKL +lQz50DC6Z/xxZLUWSdVNiFaB9irPxE07RRSGou4fbWODNJFckunIKBQhDMjmjzZpVuo lCnw== 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 v11si477983edx.139.2021.06.08.12.37.00; Tue, 08 Jun 2021 12:37:01 -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 7C6A4687FDE; Tue, 8 Jun 2021 22:36:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74C57680618 for ; Tue, 8 Jun 2021 22:36:51 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lqhQw-004uMn-0C for ffmpeg-devel@ffmpeg.org; Tue, 08 Jun 2021 21:30:42 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id qhPxlr3S7ljeHqhPxlDuKF; Tue, 08 Jun 2021 21:29:42 +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=8GPBxQJXZf_sGB0bZQAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 8 Jun 2021 21:29:39 +0200 Message-Id: <20210608192941.15327-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfP/QX5+Aw9VZu6B3VqvFc6vyNDiiIkwKLbqtW49Ne5cgG5CLWMiOB8S9djPlRxHVkPmAV+A0mR12sZGLRC+ycPp4NgaEkpjabPCCJ8dNQLXpzlEKVRAn HATSUA+8R58vh5sGvieLz+1NRA/se9UuD8rb9zil7hXrjrksenMf+m5B Subject: [FFmpeg-devel] [PATCH 1/3] avformat/flvdec: Check data before casting 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: 9s0TaKPrh11r Fixes: -nan is outside the range of representable values of type 'long' Fixes: signed integer overflow: 1000 * -9223372036854775808 cannot be represented in type 'long' Fixes: 34890/clusterfuzz-testcase-minimized-ffmpeg_dem_FLV_fuzzer-5334208657620992 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/flvdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 6bd6c8c944..60d1a5c654 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -682,7 +682,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, av_dict_set(&s->metadata, key, str_val, 0); } else if (amf_type == AMF_DATA_TYPE_STRING) { av_dict_set(&s->metadata, key, str_val, 0); - } else if (amf_type == AMF_DATA_TYPE_DATE) { + } else if ( amf_type == AMF_DATA_TYPE_DATE + && isfinite(date.milliseconds) + && date.milliseconds > INT64_MIN/1000 + && date.milliseconds < INT64_MAX/1000 + ) { // timezone is ignored, since there is no easy way to offset the UTC // timestamp into the specified timezone avpriv_dict_set_timestamp(&s->metadata, key, 1000 * (int64_t)date.milliseconds);