From patchwork Tue Apr 5 13:37:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martijn van Beurden X-Patchwork-Id: 35210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp303680pzb; Tue, 5 Apr 2022 06:38:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSn6w5PNzegRvWrajRw8GA71tqSrA2RZYMsgWxMXXcgt3uY0gw7zH6MOykJTUIU6fAsV4y X-Received: by 2002:a17:907:7d86:b0:6e4:a344:2162 with SMTP id oz6-20020a1709077d8600b006e4a3442162mr3550847ejc.576.1649165882923; Tue, 05 Apr 2022 06:38:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649165882; cv=none; d=google.com; s=arc-20160816; b=yE0wIvA/tvAVnzew0S3vi7KaSVcVYts+YPlpDcsZxxODVR7ISWO00CB+P/3TCJxlfc d87n/17rTLxv+eLznX4OexpNO5DBA8HCF4wVfqsuNuESyO9fBYh+6d6iTkpf+WkdEeDU NN09Ssx0hA0Fi5H4QvIFxj04rvQAsqW/HECJrr9ciuyE+83ljMbf9VGVcEr1ckRH1j0B +S//cMYIfDNdhUgeOCdoeEVwhlcO/KQ/DIq9JguFwZ00OYMisFStTRfyoRQbRU27uMVz OWHrN3ur+qe1TDCzxxML4O+zd4VZLG85ASm54+jsZjCKrwEVi+CstlBVZPEbvo30geRW /MOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7WwqmwOivC2qv/wg64SpSoGKfaaxkvgLjc7H7M8E5Dk=; b=io2lNlZ0lPqei6F6MUtOO/Qaokl2UIvwzawRLIBEffsowHx4x+JgPlDnOaUayxx3LL aBBasSYsJorDENgZnTTFDpFL9pgtTrXH6EX5QNjeufvwKBQ+u8M+L/5A79uW2BqgQJ/Q DuQsTwPe8CTiCRIWp6efw2RVNK4Ir+bIT2CpwqOui5UWiqlexiinnyz7JChRPNx5n/Ht 3ksB1FsNJMdx8Uqhv1sJZVOZbdqk6kF86QTuKmI4ZBu0Q9TRVGTe6aYGN5fk7c8SFEFP obLCB1e0VGFJM/ocxE2HqUfPkyOwyLueuYObWhdLZGv+e1i5raokBsdH6J4D+y3UKqvh yotg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Toa4pGxe; 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 j21-20020a170906831500b006df76385cf9si3777532ejx.409.2022.04.05.06.38.01; Tue, 05 Apr 2022 06:38:02 -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=Toa4pGxe; 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 ECAD3680602; Tue, 5 Apr 2022 16:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF54680602 for ; Tue, 5 Apr 2022 16:37:50 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id r10so9213534eda.1 for ; Tue, 05 Apr 2022 06:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aC7pULwWQkA56wU5YkyczS8duqSwYKwc8owj/KFVFCg=; b=Toa4pGxe554Cqiz8bQSo2ifFDYT+SzpNGr9k9PEnxcFLr8ck4o/0sVS8m0tegr755J az/HKIKYbFgWIwbV+yrJVp4cMq9PtUYAYj3OPd+XRvVgC6+/HMf7LNDC3zAT0rGi0w3T S+AvxVKPwET0tXLu9mVPGrkEzjl0LKMDe978RZnd1oIuhiVYgACMtcqEHD1LLlb/+Iv6 aQaaoFu28Y5pqow6HJtcGU3c2QK/GRSachylFGN7td6bGh8JmhdUVd4fAbSV5XUzASmY mP4LUNQxWoPeICEQ2peNZUp39FBrZQPjHzMNny+5O8wEpt9PB8VE5asbzaCPwc1eNb9z 8+7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aC7pULwWQkA56wU5YkyczS8duqSwYKwc8owj/KFVFCg=; b=6fjSuQA5A9fb3yXSKp2olXsIjLOZjrApdm/777wZ4owxOveA1YPi9MA6VdetrCyDwN qMFRE+0JqnH1iAnwsftxcxJPRM2od40GZpcEkaIjebrfT6VEK4gttqWOheM/gaKICutG olzabYRaDaGkfyiMCsj85IFjOOwNSJnID4TEamWk4citHtliadIIbvf6OgjMw75zu6tm FQwahFCeJzlnMTr/1tWnMljd5AcOkl9Exkv/AWXpkOQ89jO05UFKt+1oi5iAJNdiVnaY R6q4GDIxcN6TPT0SeLtxx42s6sJ5WZFdvk30QXbh2BWoIkJLE4S7PD+kfEvzBdJtgBn1 azpA== X-Gm-Message-State: AOAM532cerMX7KgHY2T0w3fO7+53JNuqPNUp8XyQ+uTIXcoiNyTDBIei sQJHNemq32g29QKy2twcxFMbc9YDwnc= X-Received: by 2002:a50:9d0f:0:b0:416:95a3:1611 with SMTP id v15-20020a509d0f000000b0041695a31611mr3661065ede.77.1649165870023; Tue, 05 Apr 2022 06:37:50 -0700 (PDT) Received: from localhost.localdomain (92-64-99-37.biz.kpn.net. [92.64.99.37]) by smtp.googlemail.com with ESMTPSA id l11-20020a509dcb000000b0041cbaf0ce2asm4519015edk.6.2022.04.05.06.37.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 06:37:49 -0700 (PDT) From: Martijn van Beurden To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Apr 2022 15:37:47 +0200 Message-Id: <20220405133747.318846-1-mvanb1@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/flacdec: Increase residual limit from INT_MAX to UINT_MAX 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 Cc: Martijn van Beurden Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LHyUC4h2GfyI --- libavcodec/flacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index dd6026f9de..cb32d7cae8 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -260,7 +260,7 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order) for (; i < samples; i++) *decoded++ = get_sbits_long(&gb, tmp); } else { - int real_limit = tmp ? (INT_MAX >> tmp) + 2 : INT_MAX; + int real_limit = (tmp > 1) ? (INT_MAX >> (tmp - 1)) + 2 : INT_MAX; for (; i < samples; i++) { int v = get_sr_golomb_flac(&gb, tmp, real_limit, 1); if (v == 0x80000000){