From patchwork Sun Sep 17 08:39:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 43759 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca2:b0:149:dfde:5c0a with SMTP id fx34csp1294899pzb; Sun, 17 Sep 2023 01:32:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqqvku5omyJ/VkZWAybQAU51q8wcIeQyo3R6NbE0V5cCOUf6axfFOwVlVZCR+d2Fs1BDPF X-Received: by 2002:a05:651c:220c:b0:2bf:fa62:5d0e with SMTP id y12-20020a05651c220c00b002bffa625d0emr1713743ljq.2.1694939523942; Sun, 17 Sep 2023 01:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694939523; cv=none; d=google.com; s=arc-20160816; b=kZ6uKdwNsNmRPayCm0QQqtIjLV2E7UyI9afpEmMLCUZHyHoFjv9HD2NftIkU1f7IoH Empg2/LkQFGF2QiHNfc+sLoyx63SM9CCfTr+OAK/CET+MWek8KIc8s+JkYljA+RWTl+n 1hy3AdZ1y2/1VpRDmiFcDWhT/jTB9kazhXlWU13VoFx6vhG2zgi77fIpTNhzON0LBegq 7GrjIq8tHxSTvSMUvo+ZtC5O0g2bc57ae4TETQfnVE4Zriu6mOdiN0Rvoxa9OQb/hcld gOfKyLNSD3l0eq+fLVDwe91ndO18J2apWSMWqboNGDfJxn23D8FZb4kQLDz9bCPsmB9r k3Cw== 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=dBKIqfhjjeKSg/+Han7s6Zi1qZa1p48iz7MuGvxKgLA=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Jr2maXA17XzSJmsywvOorqgnCo5hnln/JULCe3SzVIy20aE0mV+VGSV9+5G4NxqHrX OfJzPCfOodCxku9krZ73dpdEmV0CxUu33G+b+5nCEWMcGhaSDMn8G0ZlfBZIfBIT5SNr XWsB+kEhsOCGG6ulDex5AYm5inKRiZKs54utZlsocpiHGljjojH15OW0jlSmuvf9EA/r 2IJ/L8cUM0WD+qyWwdg61yYZhLqhC24iHxYOdeFT6KbWUz067bbqGD09ECFWFLiPP8g/ hgG0jW57mKrWQOGQHC9Tn7gzRpGNJVRuAT72fQ5sWdfzAnY2edxzuxiuMY3f3dg1j1NQ EKlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dkWJUfzA; 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 d19-20020a170906371300b00987b20b66bbsi6320591ejc.711.2023.09.17.01.32.03; Sun, 17 Sep 2023 01:32:03 -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=20230601 header.b=dkWJUfzA; 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 70BEA68C264; Sun, 17 Sep 2023 11:31:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f181.google.com (mail-vk1-f181.google.com [209.85.221.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D6B2A68C49B for ; Sun, 17 Sep 2023 11:31:52 +0300 (EEST) Received: by mail-vk1-f181.google.com with SMTP id 71dfb90a1353d-4935f87ca26so1488140e0c.3 for ; Sun, 17 Sep 2023 01:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694939511; x=1695544311; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=aFdcGDFnK5/mkHw/uywA3ObXsaUw0AHjM5hwz/PnMsM=; b=dkWJUfzAkv+36BOh4pb2NLCmOP2BN/7HTgrN2SfEMm5W0DVkW1KkyYMzHnqVMSpl2U nLM0YoUGkd4fw391Iax7FlcnbZ5fhonZY6W3FvNshzTnj0XctO1nEZVl+UaIZkQ9/b9i xAVpJf8gwc2kggZYNGo1wv1Oz8DgD9FUkDca5BvYRx8OnvVWL9oCuwXSYFy4TZLQzFEW yGEsJZeP5NxXYXvOod3o0dH+z6Qq0yuVZHmx47z1GRVMqKVYHSzGSK2+UAtVwIKlgPkA RFtz8R7WFCoUBk9lx9jZKA7sa9ApKZlxtjCpD51XAFjmHGv0RevFSFNnPr+N04YMeBRM YdbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694939511; x=1695544311; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aFdcGDFnK5/mkHw/uywA3ObXsaUw0AHjM5hwz/PnMsM=; b=cm7MowvAEi3aJgqRZ+IeANCTVcZsDWiE1G/kFUg08UtyTy9hcJywO3hFHfLizejvaR CQSeK9hl0/Brx8Km8tX9cRHwMcWOU/3LGnlySbodtU5NEPUMLR13okAT8DKSC9GksFtc RdAsLWqzxQ4Lc+VHijCB/z+Mx70Za+bNZpLTXjFkJ8jxNqgaIIAZCxSTGNHb5UOPYBM5 gYOuFBWo+kKHaSLTyHniKL9ypSP+RQIbYLr3x3VsmD66Dwp0w9Cj53nLifFUiEMVdmMM rhkoqsZgTnYdTgVI+KpYJjoJmZKCuE/JHRo7zkEYKR+h+uHD1nq+pe2Rc3VDd6v99IQ1 BSnQ== X-Gm-Message-State: AOJu0YxTr3LA9gZ+84lZijvJAOduhS55midBU+/jm76RMaZTWvq7T2tY SFzoJ15y1oNVyvOdGxr2tC7cW3OEUfPx722vDKxZ8GeOqfQ= X-Received: by 2002:a67:ea03:0:b0:44e:9313:b045 with SMTP id g3-20020a67ea03000000b0044e9313b045mr4892046vso.7.1694939511064; Sun, 17 Sep 2023 01:31:51 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Sun, 17 Sep 2023 10:39:21 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/vlc: multi vlc fix 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: rvjG4yarGKG/ Attached. From 1bd41c73a9113fd99c4f920dd9493fab258c6a84 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 17 Sep 2023 10:29:34 +0200 Subject: [PATCH] avcodec/vlc: add correct upper limit for recursive function Signed-off-by: Paul B Mahol --- libavcodec/vlc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index b353d2e86c..3b66c94354 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -419,7 +419,7 @@ static int vlc_multi_gen(VLC_MULTI_ELEM *table, const VLC *single, } add_level(table, nb_elems, nb_codes, numbits, buf, - 0, 0, numbits, 0, minbits, max, count, &info); + 0, 0, FFMIN(maxbits, numbits), 0, minbits, max, count, &info); av_log(NULL, AV_LOG_DEBUG, "Joint: %d/%d/%d/%d/%d codes min=%ubits max=%u\n", count[0], count[1], count[2], count[3], count[4], minbits, max); -- 2.42.0