From patchwork Tue Jul 20 22:39:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 28995 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp6297253ios; Wed, 21 Jul 2021 08:12:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzXX7EMr1XqTZClkWK2ipMwf1Llk9ZIhLGVxTf5jN2xV3MjpdWd8is2Rhj3AX+wt3ZbbC2 X-Received: by 2002:a17:906:49c1:: with SMTP id w1mr18895842ejv.218.1626880342616; Wed, 21 Jul 2021 08:12:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626880342; cv=none; d=google.com; s=arc-20160816; b=ipuRz6eLzbwupwPNA8Du4oBMfpWxZ2bypnS7gcbzesqHpd+kMV5slz4PY22g9iqljm +NkJXHvBvnp2vSZOfklVbX5zUdacPfH6BpDedZ3bhwf+R8LlRQKUvlCq/6kdRdC6yV9F t7ywgtRY7lcVj+AiccysI7KqLOqnyijpNjxG3NIxTw1CLo4Fvh4PxNSmb4OBnQamneKg NHMpMw6EwORpxasUpdoZVtrN7klksAel28XJReNIKBR2+Yyf/hq8i0RHl7tjQ9ldhhSE b1R/WFiy4MsArTh5274kc1VoobRFo97502yVzxIQJATf//5DhG1gp2Bdoe9iEF2Az+2e 9t1g== 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=NdJ6vPFeKJbgf7AZNVLtYffVrBJzFHvY07kzYfWRJsM=; b=denl/X3pGfEQZu2nkZvzBVfVaBZ3E8iuz5hDEHkkuB7SWHd8hCG7MiXYwqzrJTVAJp tGYWniecpPEI+kBPMvL+DJg90Zk6BXIyXWXFs1nj/9ZNsPoH/88DhHlRrJD6CUxw0fh1 NIPq7hfaaA8vklFMr8zAmYNrnZ6ja243puVUG817RFiuDvPTuDEnx+8g9evwManUbBm+ ZcFLodzomhv1X5Xv+OGnhpSHqGCEwMZI/N2AjTIR6okfoKH47tYQyR2XGtiS+AMjRpVX ruC940tAwhWLMwSqGeYdjePI2B6ZOliSuJtGuOHCzmZSQfL3YObYW3uHKbZkr5taggeW QvVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=A8EbKPuZ; 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 g20si12024814ejf.434.2021.07.21.08.12.21; Wed, 21 Jul 2021 08:12:22 -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=A8EbKPuZ; 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 1E9AF68A917; Wed, 21 Jul 2021 18:12:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 174C068812C for ; Wed, 21 Jul 2021 18:12:12 +0300 (EEST) Received: by mail-oi1-f175.google.com with SMTP id w194so3191108oie.5 for ; Wed, 21 Jul 2021 08:12:12 -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=/KyvaCfenGQKcu8cPq+H8Uqnak+2jtjisFvbhTnanG8=; b=A8EbKPuZGCf7oTNWBDnjX/PshXaoX+73M/qVtLzWUd9y5b4sq0kqFxZldY1P9KpQyk 6pnsrVE+82VGzxcVLwmd6HgccX2H+zk7MqmGDgkAeFdlUEGS8NLNAz7kJ30joVN6K2x0 PZmGvfFdOl1v1bjQx1tZJiZqZdgjYmXGgnuIz3vnRebw9y9PXY+WmtrBZX44fUs4JFFe g15cEG4dTd5ms59B0DpVNnHYimCbWRYWlrKr7YAB1hf99I68wjnnVGJbHwwAWUj5W4Ua IgZBh83OZW5hkF2weFlvIhwNfgM9ySEGqNje8Lwwbyh8wq+OTftohSUbNa7mOfv30QJw xENg== 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=/KyvaCfenGQKcu8cPq+H8Uqnak+2jtjisFvbhTnanG8=; b=A221OpnD2MdOpz5P7Nrto5lD/GUxCC6HD/ie/MxSXxAj9fSWXLkwK2QSZLcpVy8lyb lG8AE9aTc2pxvJfp8yRTkbAEYpAl7diOxI4MrfBvzBOefVU6nliqLmRWEBN34NHNPG0M n/S1/3LmTp+fiLl5v2yr9kv7RJbi+zb9t9FDiDfpguJZH80hs1s3Bowy18Js+rpZLVQj StKfbjBVpGxGozhbGF66/E4hyUPXk3Yaup2feAUUsbMUXjEONjnn7wOJVSA0TcXYeHtT gvtlkpZwGe3AKLNMdHaDRhBbzes6oBi12SHfJ+nsXfM7gMHGindvQZGPQCtZtprW7GN8 yvAA== X-Gm-Message-State: AOAM531ZvpROHcVKCZxAWTvOjDXPu6Ydo3rDZ2ET0712K+XJlDyQLJRF qETKZArwwNNHQZQm2waehrzJCGkxB5w= X-Received: by 2002:a17:90a:c78f:: with SMTP id gn15mr664302pjb.90.1626820771275; Tue, 20 Jul 2021 15:39:31 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4011:efbf:81f6:dc39:c15f]) by smtp.gmail.com with ESMTPSA id u12sm7911742pju.15.2021.07.20.15.39.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 15:39:30 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jul 2021 15:39:26 -0700 Message-Id: <20210720223926.3414168-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.32.0.402.g57bb445576-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: 00Aqfkb8Apew --- libavcodec/mpeg12dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b27ed5bd6d..a786e48054 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1341,8 +1341,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 ret = 0; - init_get_bits(&s->gb, buf, buf_size * 8); + ret = init_get_bits8(&s->gb, buf, buf_size * 8); + if (ret < 0) + return ret; ref = get_bits(&s->gb, 10); /* temporal ref */ s->pict_type = get_bits(&s->gb, 3);