From patchwork Tue Aug 23 20:52:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 37421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2117492pzh; Tue, 23 Aug 2022 13:49:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR4IkWhR4CO14Yfw4+cEuXdJWoVd/UIPGKA1dlmpwtTSoqseJKBL6rV5UuNa6gLNVd11VX2n X-Received: by 2002:a05:6402:4241:b0:446:a039:1e78 with SMTP id g1-20020a056402424100b00446a0391e78mr5156557edb.306.1661287753805; Tue, 23 Aug 2022 13:49:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661287753; cv=none; d=google.com; s=arc-20160816; b=ZN5WYvVt1RC4TGgXx/ZQXPfglwFc9uB7U3/plxRDtc8U7GHMU3uQuTb+UNwwAhWARg aLwFuksYT/a70s5yl7TS+BKCwhdsA1tir1NRptJWsmcFbeqCTkMT3XA7p6KwiHCW+s3X 3nc+RVZB9NslglDh+ii3C/9H1LTzB89JxpZeVBF0PlndWbkohwdgOfHYIH9Kj0wqlciC MR+KSI55CYr/0XEW+/Gj3y1gqGwHZIPQ4QvT/a4ohVed95VUG5PSGJDCruZaMueedv1t G27h7TYFWJl+9rCeGpbEMhKkq9b4+QPVR8fDHBQ4y5c5smxI8fgaLHjmaMv/q8wONXkp +dBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=NWmfcypYddlDh9wUMZbYpS2VeMuB16j/3sRs05vft7g=; b=IXlCXj+JwhHHSQ4X6mArv2AvaxmVi0eOW5XjN/c3SOCuBj3I/zemtp5v7BSXkxCMSF jql0g1aJj71Dbf8Ls3kQCjceDcCLLckOS8cov99vKoFf3V+JP6JXeSMILtFY17hQ5WjV Nv06T48eUwbTEL0MDu1JsxoOqfPZh2OjH57XGRAuravahMO4qxqt3Mpajk0lSXLM1pGU FZi50pp13JLGUIMgt23upYftO4SM42028vgD/PjjaEgbsJ3tk68k1KNfQVaXydE9TvDY dbD7DLWo5f0f5qL+DdaVTwZdfdRY59mFHhPIYa9YVv6Sl4cmbzvsK/2JH20MgreWKAbn I/5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hvh3qFT8; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l13-20020a056402254d00b0044301c6aca9si3340217edb.379.2022.08.23.13.49.13; Tue, 23 Aug 2022 13:49:13 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hvh3qFT8; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9503B68B9C9; Tue, 23 Aug 2022 23:49:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f174.google.com (mail-yw1-f174.google.com [209.85.128.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97E1868B8F9 for ; Tue, 23 Aug 2022 23:49:04 +0300 (EEST) Received: by mail-yw1-f174.google.com with SMTP id 00721157ae682-31f445bd486so410639357b3.13 for ; Tue, 23 Aug 2022 13:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc; bh=Mm43A6sXZiX0E2s0sDO741K2/cDGnV791MULWTrrPyg=; b=hvh3qFT8RGvwNYtk/NIzNRlXhWhuEEhs91kk+w4CqEPuW25xQCgUsOboYT+Y0JofrF OBNNi4MunOa735zTBU64TFwcx4J4MeM+EwAntz0RHrYuwaWUgBK26Y2tFV5ElVIiL89p DynAYi9zCn+r+plijsBdyqopnKhsbVTYrkWR/+zRI3ym8OWQuh2GIdrh/W7Rd7G7kChL Dt2x0osEEoqpBho9OjvmBdRCIlbEWzxhNgkJV3afklaxqoOXEDXJ0jx6SorPg6jotaRA 1g8bEezrndCEuCOBDgZ/4Ra55nWazqQRhjLu+yKN+KlR/X961Nx7bXPGajrTckD+HKqW h7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc; bh=Mm43A6sXZiX0E2s0sDO741K2/cDGnV791MULWTrrPyg=; b=jcxaWgm0dECQE4pBh6lRE/mcnRtUSg84y18yrZEaNkey2ARnJAizajmtKIJPqvM7vN 03caSf6XfOdGDTgoIWBc41yTPGOSR93mYov5y7vg5qGAJPKR8I0enNXITXFZ9ICWtuXW 9EoYL/5zUwpidh1jhU00EjyP8fZK72GxJYmY1Fn6vxC1XKBz6OQUL2AGK20mw/r42Lbj 4C7zcysX8iBCy8dx4I3Bi5w3hSiaYmk4uxpgjYdG1R+taGWY9jwQ+/MFGGdb9f6sD1ct +ejWmQnqPCDh4WoK1Sph9VExVo06D5/nkQOGOYqaSmHNk1kRz22cMrw/Tlz82xYiQMMw eGIw== X-Gm-Message-State: ACgBeo08FzzX34xYMdXfaQnqqizmo+wWS3xpQT8bLoMqQjcN2H4ME/MZ wNEB+9VOcL9GyTMmGjW2QGsvtUz1Dn2aRgRNV3jE0h0w X-Received: by 2002:a0d:f082:0:b0:31f:1d1d:118d with SMTP id z124-20020a0df082000000b0031f1d1d118dmr28134675ywe.124.1661287743324; Tue, 23 Aug 2022 13:49:03 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Tue, 23 Aug 2022 22:52:17 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] Fix wavpack decoding regression 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mfEGw8WEd4BR Patch attached. From 217f31c5eb9355bb8fc61a9f46595ee06628c8b9 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 23 Aug 2022 22:39:41 +0200 Subject: [PATCH] avcodec/wavpack: unbreak regression in decoding Signed-off-by: Paul B Mahol --- libavcodec/wavpack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index c12e1d6ec6..8ab195cc10 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -266,7 +266,7 @@ static int wv_get_value(WavpackFrameContext *ctx, GetBitContext *gb, INC_MED(2); } if (!c->error_limit) { - if (add >= 0x2000000U) { + if (add >= 0x20000000U) { av_log(ctx->avctx, AV_LOG_ERROR, "k %d is too large\n", add); goto error; } -- 2.37.2