From patchwork Sat Sep 18 10:01:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 30356 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp120545iov; Sat, 18 Sep 2021 03:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7EICLry2AKTI+tu1fve/meWgQpGkW48wi/+bo4koHMuqq/BZuRT5d4gUKIIyAf2Ec5AIw X-Received: by 2002:a50:9b52:: with SMTP id a18mr17760918edj.165.1631959322154; Sat, 18 Sep 2021 03:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631959322; cv=none; d=google.com; s=arc-20160816; b=j7WX5O4+aceFgVqtrBkl5Im+L3baqGkbuG/y5H1dEjJMuRSy9MxPZnuFvTXsM+f4/z kDd05asVB2MK+raNAmwZHuJF5rxZYiTuQpMU9aXWl25k6arXeJiZ4jOApSk/MfWG5IQt 6TRbUI0KFgnH6J/DU7q+rzaOKfrVR3RDdsx53FgsFzzSHgFeDXM8i59YjzcsFbdsbjUm JAxlnudFfEOS+uyoV2htsFBQxipBGa2mB20a4KPcP6uX9bUguU9X07O4F/bnsLHXGMGH 2N5hGPjZB0dulyYfByMMA3J4CfGbgbrCAdHBWOBrPxm+kfWFRaBdOxnuJgEv7q9+MaIQ tk5A== 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 :mime-version:message-id:to:from:date:delivered-to; bh=ImrUE9YvgsAUHrXwtFUAk1vnUuZVoGG5HSdxnOaR6Ts=; b=wMTnPZskoWHsO7nFwmqqVipitC3HGsAuO11DbqL+2P9NmbdNSCGJYa/qfasxYAc+X1 RXj2W5oBoCbZ/gErYCZ6kXrjK2vT/bDBfFAMHy/WbxJFp12f/KKu+nTwX9Dejm8vo4cw 4qEOCM0kiYwa3DeJF+R9BMk2ap1bKq0eDCl46clB9mw67dOy7BRk9+6PCAzCRHerbNXQ ZmzXqFIDoghxynwZCWBgDA+G3hm//K6K7dGYiiz44JnEH9Y04wg0L7//4Fqdj1GvIbB5 qjXOa6uWZOzwZ8HvO98N35rncC+buE4XEFabZsdkTuCTwWTKlmdQRyjTn4y74OhYl8p4 hk8g== 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 v22si10433953edb.257.2021.09.18.03.01.59; Sat, 18 Sep 2021 03:02: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; 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 A5CA868ADE9; Sat, 18 Sep 2021 13:01:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07A5468AA0C for ; Sat, 18 Sep 2021 13:01:48 +0300 (EEST) Received: from 01265acabc6aad6a4a464cb17c468ad3 ([1.145.161.12]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 18IA1geI016387 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Sat, 18 Sep 2021 10:01:46 GMT Date: Sat, 18 Sep 2021 20:01:38 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <5da14be177af2fd768c1cde4d450b27d659a5472.1631959242.git.pross@xvid.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/siren: prevent getbitcontext overread 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: uYaPg+NP7cn6 --- libavcodec/siren.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 2161b29a2c..3b0ad7b642 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -608,12 +608,16 @@ static int decode_vector(SirenContext *s, int number_of_regions, index >>= 1; - if (error == 0 && get_bits_left(gb) >= 0) { + if (error == 0) { for (j = 0; j < vector_dimension[category]; j++) { decoded_value = mlt_quant[category][index & ((1 << index_table[category]) - 1)]; index >>= index_table[category]; if (decoded_value) { + if (get_bits_left(gb) <= 0) { + error = 1; + break; + } if (!get_bits1(gb)) decoded_value *= -decoder_standard_deviation[region]; else