From patchwork Mon Dec 9 22:26:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16687 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 96E3B44AA6E for ; Tue, 10 Dec 2019 00:34:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 783A468B737; Tue, 10 Dec 2019 00:34:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA6CC68B71F for ; Tue, 10 Dec 2019 00:34:02 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p17so1021202wmi.3 for ; Mon, 09 Dec 2019 14:34:02 -0800 (PST) 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=TwRRoTuBVQvpb7Pmn1jW/L+jk8VDEPBqWMfAacp4j9Y=; b=GihdSHQbG0glcgziBptOuNjyi01ydvb208YwxP0S9gECqJ+GNe2JWuZignJCGrcQy7 JqwEyYQfWu8D2PnrMdM8CyFRvmIZ9itsfYlAIYHdDFp8OS2yKAvJkG35n5eaN431oFVE md4UZILD6PAEYZpnFNrRR4n4kR318guMjgl+f8UTJyv4uVwHq6FG1bqj0cXEgW/y3d5Y dTvoB5HgW/HBnyqGESgmWzvYhnX7SqtUZyL+s/BfCziSUrSi5ek+9hRJP4gTaNpqia/8 cYMg3Kvbpnuk8d10UwdVN4v8NH/ttNQPTB4Lw8DLRPq7gBk90p/ds0qp3/GZB1HHl+tk WB0w== 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=TwRRoTuBVQvpb7Pmn1jW/L+jk8VDEPBqWMfAacp4j9Y=; b=eNdaaDXKLuye8a5X8ZcCjCyVDefLWgzMQ9Nye6k+weaTvkQiwDfAtUwItnViJcM6WJ BnsyYxS2rFkU9gV6HxeMr3wax8ihRSaV+Zexz4E9esZoI7jzyxLnJj7tb7iIOyjpMTtQ jjcseQTbl235VdTsULLxtba+TMwEhsAnlGJ3L4GOsoHPX06vQz+WJd7QLM4jPKAxcGcy LIHeHsHSTaY0ni9WVD7JyRFOtr2pt8ra+nYyLIU9jcHOwcOg+OcJNy9j6VKDN1Grd+tQ AH3oI6Kp74ZEFWKaiHu2pKMvZKhNka+01ACaXmJPMZ3Kpp/a7/n+ePKV3LOGgiqV2y/8 sy0Q== X-Gm-Message-State: APjAAAUl4Mypxmy4h2n/RJfA+i9JJbZyQDSQGhMxzYI0CD/KuKPfgHxz 2BEA1hX0AYSsBjFJxUEFuMbMabvR X-Google-Smtp-Source: APXvYqwW463mdLqk0oarWiotuinK214dV92oyf5Fre05LXFy0bfGPMLAUC2LwuTajBp3xSW7HcZueg== X-Received: by 2002:a05:600c:219a:: with SMTP id e26mr1504266wme.42.1575930842343; Mon, 09 Dec 2019 14:34:02 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id v22sm865893wml.11.2019.12.09.14.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 14:34:01 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Dec 2019 23:26:04 +0100 Message-Id: <20191209222604.28920-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> References: <20191209222604.28920-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/cbs_mpeg2: Treat slices without data as invalid X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" They are spec-incompliant. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index e42c602476..b57551c92a 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -245,6 +245,9 @@ static int cbs_mpeg2_read_unit(CodedBitstreamContext *ctx, if (err < 0) return err; + if (!get_bits_left(&gbc)) + return AVERROR_INVALIDDATA; + pos = get_bits_count(&gbc); len = unit->data_size;