From patchwork Mon Jul 19 22:16:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Foucu X-Patchwork-Id: 28977 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp4803628ios; Mon, 19 Jul 2021 15:40:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxpYWjW3EuC1TrPrJ+5KYN15yaT538HXlcgfFKLGcgEnqo3ovq1PNMcn7cCKR2aROjeFdUw X-Received: by 2002:a17:906:46db:: with SMTP id k27mr29492586ejs.391.1626734459178; Mon, 19 Jul 2021 15:40:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626734459; cv=none; d=google.com; s=arc-20160816; b=CCQAMhikpR01on4VMucWTpK+S5/WRYLJuFbL5Oszri90BSQJSbszJIyiAoeOUZOCBT 3RSeL3YOvEo/HXG4Nylj5wYjyzD2ltc7F5BC44dBwjVFd/kdM7iF5bQoDIW7maY+R9V0 243T1WFyCyKe+OEIpYF2SDZ8NOKKGmOIH3ysDPGuOp+2BtvnOnFN+u0tu7XH8hSgvzDy Mz+dE+zfKoHqxypGN78BvVI2p9ss0wi3pjtVJSVrAYXYhtCsXNCyXo94nhwpbqb1jAY+ 8TJqJ06RNsefujTwEiHxT/8iAlKelODGzDW9oQEMonFARlK3YJ2RqPiE15GsZ78Iu4OH 7XRw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=buvS1HHC+ztjUldjRpVsevK4FcXWFA9mfC8/NdalUqs=; b=gTbhIwPFiRkrWoSt4+zhQrK53oaYCyLbmR6EoyOAQk+GwhygdtzkEB9NIA2YnSrN2Q +7ROh2LUX2/d3vL8fOhz5e+LbzcUCp864vg7UCRTYSv1uyVn774MwnKupg3ofKzI0hXU t9pavWBOVSCgRyHwjZB2ylAZcZQPn5uGyvst3PYhTLjFaeNkB3FYRNUCdkpY8zIH9jcs 5wAu9m8dyyd71NnMpGw1gY98J8Xg9rwfC0zi67Y2txONIRUly7Umu4bMI0gSIA9ItsDX Ir2zOx9D4LwayOvq+d6rSrxEUVoAsEzpgMFIyym+kia2EW8h1k0JfdbJfC57ZyPqzV+Z vVIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XsE+28t4; 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 bi14si21544740ejb.441.2021.07.19.15.40.58; Mon, 19 Jul 2021 15:40:59 -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=XsE+28t4; 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 78A8868A906; Tue, 20 Jul 2021 01:40:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3083168A852 for ; Tue, 20 Jul 2021 01:40:49 +0300 (EEST) Received: by mail-oi1-f171.google.com with SMTP id e11so19472227oii.9 for ; Mon, 19 Jul 2021 15:40:49 -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:mime-version :content-transfer-encoding; bh=i2ZwvvDfR9XiB2ULwmp+UDLSyku5nJ6iTGw0DbhzCk4=; b=XsE+28t43LZb+PTDGq88JZfbNcUH1bY+ynmCuLWpzfmS8VsAfYJx6jYPUG+VVdP6A9 zafYZYKfSmBqENI3Dv02EfHI7H0DgzZMtFVd24e1N98Z6nDEsR/EegckpZqVSB9pNpkw Sk+i13uqO/mDVLkjnUGWQBRX2sG4osaBRi0ssObRoDmelvKFEmRvtND6rsTMKijMSCR2 C+e6IfRqnoVS4CXQ1lV669/SQ9dH0UkKyXenUbTypHJCedFq4uRooonKbDqMwTmPrbla YA84PEWc9AEGBDPjXz2ZsB0RaLkkEBKZcFR9N1ZF2cXpc1VT/lWxY//ydYOUfFfeoS8K 9qjA== 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:mime-version :content-transfer-encoding; bh=i2ZwvvDfR9XiB2ULwmp+UDLSyku5nJ6iTGw0DbhzCk4=; b=qXGi1963SRZbvvmmBJ+oRN8Ky7odsSyA1mOv8Hr/K29LIu7I9k56dCii5u9eQIlVR3 lv8ElAJTNhj5aOiI0FHR+xvrt9QKjr7DXz7nl0vWCUU653k4/4InK1LCUiC2zWGY5g+G YYqXz68VOdnXiVKTT0NGGPIWoSYGEr+41Fnvd2bf9xp59G67WPjGQ8/sBr761JZUxscg x9eFP8XyJIlNEnjO/9TEgJF67ixmZzLXL257DdwQUMp8BDbU7BsVyMeT+wQVaK4hnuC9 IwMkj2H0I8w4OfwwogvXfr92/cWF7ZHS+E29Ixy5TvmQ9RIrl+kBQb6mng6rrOT/7Lsf UhhA== X-Gm-Message-State: AOAM530a5vxKDQv7UFQ+BPnr/Me7QfIJuvNpK7XxJnKX3RjKtXDTPY6K X8FvB0MIJ5XJ7uvLoT0yIEA0U6gaz94= X-Received: by 2002:a17:90a:8c93:: with SMTP id b19mr13868413pjo.107.1626732992966; Mon, 19 Jul 2021 15:16:32 -0700 (PDT) Received: from tfoucu.mtv.corp.google.com ([2620:0:1000:4011:710d:1b5a:b9ea:75c]) by smtp.gmail.com with ESMTPSA id b15sm22835095pgm.15.2021.07.19.15.16.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jul 2021 15:16:32 -0700 (PDT) From: Thierry Foucu To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jul 2021 15:16:28 -0700 Message-Id: <20210719221628.3267604-1-tfoucu@gmail.com> X-Mailer: git-send-email 2.32.0.402.g57bb445576-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] libavcodec/mpeg12dec.c: Check return value of init_get_bits 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: UlGzVD7asjrg --- libavcodec/mpeg12dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index b27ed5bd6d..edca202f0e 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_bits(&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);