From patchwork Sun Sep 11 14:27:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1995683pzh; Sun, 11 Sep 2022 07:27:33 -0700 (PDT) X-Google-Smtp-Source: AA6agR7ZzB4tMxq9QjuB4KV3BVlcnWTnGCIGaqch9AAyYdW63HoVNOaN0ssAp4hr+Ypw5Sppw4wn X-Received: by 2002:a17:907:843:b0:73a:5b0e:8352 with SMTP id ww3-20020a170907084300b0073a5b0e8352mr15996147ejb.438.1662906453266; Sun, 11 Sep 2022 07:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662906453; cv=none; d=google.com; s=arc-20160816; b=VDqgP1oArmqO1uM1LrBeGfH4dLp1tm8MHTp1EN85nkl7GrmCmq3tS6Y23le7orH6RW tD9Va7zrNfKeklJqdDbtU/4mZLLQFFNDaYgGE5q+ZVyKN5FZuBmy0SNH0dVRa3clLquv WpQc7/14i/pyGj3O7Bt2YPoCiowKbtTwfhQ3951oxg6Dqdena/dMktMJMMsxWfm/Gwfu qgFeDkTzsh9A+tJ+v6JkRfM7VERnOkJhzYzGXbtgWVdMC1/t1G0uqK8MZZcMJrZQ+Hrr dDJP4GkpYhWJBan96KLqV9iVnucvRczWKyWqOuDqkaFFxAe8c6GOfd0x1nZatmQvLQIa pVrA== 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:references:in-reply-to:message-id:date :to:from:delivered-to; bh=x6rw01dQ316rLQgvZSmFCqDFHxDxjCKpcg6TP2u3lvk=; b=FeJNcGI7s9b3xAOKDprOW+th/LVCHLv3IDlFyFVMiLWGhJqtJeBUu2E1JDPfkckC9k VY23aBYuTzDnp4WMlTAQSIS2whL3H1q7yirwmw5BMMrgeuuIpMfNMDo3Hb+TTE0rEQnv ypbXA++YTwuy/+vCBfSg0s4ZiEJcgKyHRnQKI5Hpk+UdiT9e6N9YuIvAiDCveHEnLd+5 ni16IeNomsQhTiuODcWTLi3fLtrnfdnmHitgqAIfApD4FpYG01ZVn3/2YkQrS6CGobEW OgoYWP9MDdjW+ncteWbqqPosX8I9R/e+029hRA867A+/joIR1BcLRm3kMGEU6p42xwCy jdBw== 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 q18-20020a50aa92000000b00448b72c6f0esi4456228edc.301.2022.09.11.07.27.32; Sun, 11 Sep 2022 07:27:33 -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 2238E68B70E; Sun, 11 Sep 2022 17:27:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E94968B70E for ; Sun, 11 Sep 2022 17:27:23 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oXNve-006Ggx-RW for ffmpeg-devel@ffmpeg.org; Sun, 11 Sep 2022 16:27:22 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id XNveoQDoJ8s8UXNveoqeda; Sun, 11 Sep 2022 16:27:22 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id XNveoJTJUOPqFXNveo7UmG; Sun, 11 Sep 2022 16:27:22 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=631df04a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=8DdoOCZfUH7Q0U-FqusA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 11 Sep 2022 16:27:19 +0200 Message-Id: <20220911142721.30812-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220911142721.30812-1-michael@niedermayer.cc> References: <20220911142721.30812-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBx3PI4qOoxTvHi8dGsunRQM6NIoranQJp/O4tBifK2TbdvrP3a8TZcHBbbM5nkih/li47IWXYYwVH5XitN/XKiHdSB1QF4BVb/Mi3gVxb/i8vU1sF0m BqO7eJxLl5b5l+uHsFr8wG4o9Ng7a0yHtuuwrGLZ2YACcalKl75zzAVEoBT/LtyUgk1K/Yv59lpTCA== Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/wavpack: Check for end of input in wv_unpack_dsd_high() 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: kLL7p1q0Cksa Fixes: Timeout Fixes: 50793/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-4980185027444736 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavpack.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index b4d19df7ea2..3cb40775506 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -495,6 +495,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t sp[0].fltr0 = 0; } + if (DSD_BYTE_READY(high, low) && !bytestream2_get_bytes_left(&s->gbyte)) + return AVERROR_INVALIDDATA; while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) { value = (value << 8) | bytestream2_get_byte(&s->gbyte); high = (high << 8) | 0xff; @@ -530,6 +532,8 @@ static int wv_unpack_dsd_high(WavpackFrameContext *s, uint8_t *dst_left, uint8_t sp[1].fltr0 = 0; } + if (DSD_BYTE_READY(high, low) && !bytestream2_get_bytes_left(&s->gbyte)) + return AVERROR_INVALIDDATA; while (DSD_BYTE_READY(high, low) && bytestream2_get_bytes_left(&s->gbyte)) { value = (value << 8) | bytestream2_get_byte(&s->gbyte); high = (high << 8) | 0xff;