From patchwork Tue Jul 27 18:25:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 29076 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4857246ios; Tue, 27 Jul 2021 11:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd28O1Bj80IZKR5YXxKKWCBl8M9FfHPRJ/9OAik5YMGpS+OVlCCsL9mgLAowGgwgJhMzn2 X-Received: by 2002:a17:906:33c7:: with SMTP id w7mr22605107eja.430.1627410690734; Tue, 27 Jul 2021 11:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627410690; cv=none; d=google.com; s=arc-20160816; b=n97nqPWRKG33HEkvhBA39N8afv6BU5fbMrfUaA0KsSvnX8bpquuaMKut7UXvxXxIBc CdWmOX3nrziq7WmjJODuA5IyzN26P/Qz1SqcW6u8kcYl40McR2hHq5HfQT9QRBVoghOQ 0EnW5Dhyd1APRSoM9Nqb2DJZJgWDhur4JyCW4V6s3beru8JSPdoD3VuLSdALjgv7nzhT KuYV6DbdqyavUbvdTfCgA0CyyjAI9T36FJOLCmDGCZ44B7PJjOeXKo0FJBf5LTED/gfG gVzawhF1Xz0c0+oCNBsKWF9itlrydw7PLud8/YOP/QUAkH856QTOGnNqLydqENm8cHo6 ViUw== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=7upLBZg1AOscpSVhCjXlpxwHzDrY3Th41YAA0IdZYzE=; b=V7jWjoMCoGG2vwIrEueprsbuBuQHYkmbMP/1GY6l3UtohxtkPqPN24zHiWXZcTsVH+ PgaoaDaMxhvtWfDRvONDMMFHgTpnTKV13bWBp7o4LkkwQO3cJHKBSn3SU9j/wNCx3wVf 4EQubf+S/LI4+HmMqI1y+jihTCoMw31nySWC4/Z69S/UcyGiNILjdKgpspWLn3K5hqC1 /SXrZRUl+T/R3ENCwSpa6gEeOi7dambzcXYse0S079FYtXj1pP45kwavrC/+SyL+A43Q McWAMSagiXeTj22vkdKgj04zXw8jMqMbgMZjqbhItLG34JBMv7BIiF2FRpBiCXOtu77R PieQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=a2H464AO; 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 a4si3377088eds.291.2021.07.27.11.31.28; Tue, 27 Jul 2021 11:31:30 -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=20161025 header.b=a2H464AO; 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 BB70668818B; Tue, 27 Jul 2021 21:31:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B918B680C28 for ; Tue, 27 Jul 2021 21:31:18 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id a4-20020a17090aa504b0290176a0d2b67aso5683802pjq.2 for ; Tue, 27 Jul 2021 11:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IGtphuSX2rB8L9IhCC/escHaDSXpREM0wzzaNyo1KRw=; b=a2H464AOkABxQ0pLd/UAZwXQzGbm0iSRFHJPH9grmtCjRYTXPyGRBTa9wV3OxkubZG LhQA7Mj2RopZYaHxFGJM6iZAIgS7U+G078h8+/FSDKsz64Xgaoo2Wd/iF2qFeZ/ukrHB H6J8rS8zfjj6BKhI5CLwQ01kancAYwwUe9vHXGd6Y2uCNKv6HXU1KSkL0CES7P4bB+rV o4d3OkX3yOgquv6VLC0YWQczULj22jX/2a2KWQXwt8q37FqmFk9LFwUME3A5wQmnmSQv qteRU8ykW6WBiA8nZ0evDYtJWVjEJDJtuwmxC4LzcYCOvRuuiwSzpj84UIWqRJq7FVgY 2Pmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IGtphuSX2rB8L9IhCC/escHaDSXpREM0wzzaNyo1KRw=; b=EhVuLci5/F/mjsNTnhcqJDhZxooXTidIF3zsx/P7wozmWLF4fjFAXcrcX9fvK1aJAq BpUFf3A5oF/0xeX7yDgnPMswIjBThqCn8fNQaTlfk+f8QQbfKx6hffiEI2F43MOPqqlN wa9eAtRzpY2rbsGYtGG8o2U9ZCWSQaTeBH6C165BLhPeT26sNL23rMhZ0CQSlJClRn8W vtoLeBTWVJoz4ZX2MT+wMNF3SWmxtAC/v/L5iDvCTUzlnpxMRVvhqdx8KzF9oQKjgJt0 0tX34c0DDbBkPjNYVXM7LNB38jvCERcDPj2d6BdZW+HKT6FnLcp8Casvai5E8EHrFzVR y7XA== X-Gm-Message-State: AOAM531yvhzMbNPMbe5uRi0qEVOcqFiX2bs4ld25jkGUzaud8Lj8L5dA O9uQ8ZlUu6w3wKPGp6mU/z4SVXUHxCI= X-Received: by 2002:a65:550a:: with SMTP id f10mr24756126pgr.155.1627410310136; Tue, 27 Jul 2021 11:25:10 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4011:9715:d48c:e533:8196]) by smtp.gmail.com with ESMTPSA id n17sm4725352pgj.93.2021.07.27.11.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 11:25:09 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Jul 2021 11:25:04 -0700 Message-Id: <20210727182504.158364-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavcodec/mpeg12dec.c: Switch to init_get_bits8 and checks return value 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: Thierry Foucu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZHYmRke81hEc --- libavcodec/mpeg12dec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b27ed5bd6d..858dca660c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1340,9 +1340,11 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, { Mpeg1Context *s1 = avctx->priv_data; MpegEncContext *s = &s1->mpeg_enc_ctx; - int ref, f_code, vbv_delay; + int ref, f_code, vbv_delay, ret; - init_get_bits(&s->gb, buf, buf_size * 8); + ret = init_get_bits8(&s->gb, buf, buf_size); + if (ret < 0) + return ret; ref = get_bits(&s->gb, 10); /* temporal ref */ s->pict_type = get_bits(&s->gb, 3);