From patchwork Thu Jul 22 18:08:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 29018 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp742605ios; Thu, 22 Jul 2021 11:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHBgdz0IbmiLVWVlDT4UG60/pDesfJ05URbAFChdApdAP4XgmR68zFQ/W6/er7oVbaGK5a X-Received: by 2002:a05:6402:1218:: with SMTP id c24mr1014367edw.59.1626977823503; Thu, 22 Jul 2021 11:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626977823; cv=none; d=google.com; s=arc-20160816; b=vtH7hA5QFbk45d56mbDFIQj6RXuotOtFeB+HIjRdV35g19sZznT61ao5BtHTWdQn0B vn3WZCNXtRDz+wML0nwPIRAyTumraue9I3qi2SGQ7EfIyaiDufRWsDYNpNHJcfHRK+Kg EadnK20y5zMUK+ZVvgExaLUedP0nPQ4x2HEWrRvHJ2jdbyH1q0DuXarH50woE1Wx08E7 vBjg8cINuTjVycSzycaQfwLAYbmZ9988DfZNPLzz7DAPu+fF1C459p9R9ZaOlXQo4i/f DrvTnvyWkttQMV1o7gFOwtcb4XQFkr6Y3ibmWlhIqnY7+YgylOb/8yvYvL7ANeKGBxzI K4XQ== 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=KjRKwZg6JNOMi/8E2Hqk70pUuyqbYhiX+JBUqmAmKKE=; b=y1IBYl4YbgR4SpxapuMmC17rhJTdCNfL6EhCwoUMDMHfR7TESOtB+GuoOXdKldl82C mKHB/OBZa//U65aGTlSsCTbnXggg7GDG6A8Q1sr/V1RR45Qe1uYHInGgeTbl0ybSzgiq 7zEj6+MN47yF8ryecao1jkqUpp1GJDwiLMdou2M01YJs2YjC8SqWAhBgTiozkpoNQ2Yj QUeTSyVWzZlVQ5byA00qxfnz0/bKUG+y6qyB8BKEFn1yQy6CC11r0AKueQSYpREpVThA U/rSjKZSfvltvIfyRMKUHXHPQAuJIDlI6YmgS1nZ5tTL18+nHmd69JATlurpnKx1AQ39 wClA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=J+ZxAdNl; 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 z5si10890326edd.279.2021.07.22.11.17.03; Thu, 22 Jul 2021 11:17: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=20161025 header.b=J+ZxAdNl; 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 5D36268AA33; Thu, 22 Jul 2021 21:17:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B484368A12D for ; Thu, 22 Jul 2021 21:16:53 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id w194so7564856oie.5 for ; Thu, 22 Jul 2021 11:16:53 -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=uCD4RPMkthLgPWco3saTvlUhtigv3pKnWIwnZWfKVws=; b=J+ZxAdNlJ8acXUxQthAA0e17jZ0Rym29LgvPWrb7+qS+0jFHLcQpJXrzxhxPjRXftx fVpHL6DGy3b81j/XfyECfOTYrxDXN06p8MSeD5eib4+eJARNPB9WgO2poh9QbKzku5K9 bHlMOdDsjloWPOR4XMT7CMjE4W/vzjNPggIst+szNG0VRRM98yqZPOeg1H8OgUnJQVq3 oapBb9hN8hNSAjYAYnfiOWil5IZ8Wbo/qiFDcS85itGUxN3Ty3jlLnL9noO+zkvY0zMG VOaqafkjcsNsPjneoae4JMWAa1PZvAqQwvWnNjruTpy1kUDKalK9M0hnjvwTveEshVk0 mMfQ== 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=uCD4RPMkthLgPWco3saTvlUhtigv3pKnWIwnZWfKVws=; b=B7JpFvGleNiP7FZYCqAsF4+YknvmzMiTy5hIG7lOt5l8JGG/Ma1Jw08zcpFuD+pXRh iqvyymYFJtl5+5232uuMKPRLN6okRdc+OsPQ8k+hanawu5Xr/X2DxjUv8MdBOmfQNGb1 Qwn76aSujkVG3sXj1rRpMP8e8LeIUsddtLqmX8N5vQGKdqI9AWqkj+J9QQIXk0HMTpf1 AOhCJzBtX+5zI8XuzR3uCKbXs0fxN2WEEqJuh/tYOwagfsbGeMlRUm2j9bzpDSMKmdsx XzTwM37PUSdF1tgqanqS/XK/m78hVoOqaizhfUpoAraP65BSL0Tv4re1m2/HbdMsefIh P7sw== X-Gm-Message-State: AOAM532qK0sN0Tsc0mTMLb+kM1g/r3iKtuOPyu12mCPZmy6v3QXZroJz DtIrgv3kf7XPiRk/4mwb58qqMjAaiX4= X-Received: by 2002:a17:90b:4c0c:: with SMTP id na12mr936244pjb.74.1626977336124; Thu, 22 Jul 2021 11:08:56 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4011:2b0f:3522:4128:458b]) by smtp.gmail.com with ESMTPSA id k8sm21871292pfu.116.2021.07.22.11.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 11:08:55 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Jul 2021 11:08:51 -0700 Message-Id: <20210722180851.3676990-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: 2jqWY8Nc8mR6 --- libavcodec/mpeg12dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b27ed5bd6d..269619540a 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); + if (ret < 0) + return ret; ref = get_bits(&s->gb, 10); /* temporal ref */ s->pict_type = get_bits(&s->gb, 3);