From patchwork Mon Jul 29 19:56:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14129 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 428A044800E for ; Mon, 29 Jul 2019 23:03:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C3B368A7B1; Mon, 29 Jul 2019 23:03:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B66F368A6EE for ; Mon, 29 Jul 2019 23:03:42 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 207so54979500wma.1 for ; Mon, 29 Jul 2019 13:03:42 -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=s1mmRvxVgOrQCZfVoJ2RXYCIYCHv6lQtqsdDSWO8OBc=; b=cOydAPtbMwj9lkxe0vTepQe5AbHmUWp9A+Q/+YikdjLiZs6wZGembqIpAx4WljL0Xn ov35cSwmMK8/zAERk4AnWlhyT9GGEdcOjLoyLPLS6+oK6a/TN97t1Fl8NquvMElfheqK nCtW4Misyp/NytJWdUUuqW/8PLe47sfD/MqrXthaRIYQi27WDgAnSPm9kQcZUmTFf/q7 Sn43VGJExYyMbXrNT44/gJtf7Ph4dvZtGopVc8iq0eqT1TwYl5SXRffAkVO+H6jZdxlt GhnbLxnE4rwKavHL6bvTybpLHYb8JFcJLlCDaAihsiFygufu3AYLuVVyDcmNZgLc6c15 jgHA== 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=s1mmRvxVgOrQCZfVoJ2RXYCIYCHv6lQtqsdDSWO8OBc=; b=r4AxVrP7G9IN3l32ler8qb/9NoizWtsfk+ZKQSoarIMGp3DoMN5VZy4kRdqlChbeXG av31eBMU3xCp9UeNKyUWO5VCbZfNacZsP7sYcPzcIX8ZA8a4AcuRr+DMQHv2HF19Mzxh +7LRaFVSd5jgdmWBpQNBkQGf0tALizevoFZuD4W00Ri3ogiBHU23w7WqFJ4grRUwC2Mu yjjjqNviz3vjLhbjWFRqwIyyzYvFCul7kCCYjqP758Ecnxo4p2+29+i1s+xUey1POLr0 CwxXb+v3CwbiUXhIMpTv6Az5C07L+qMAzK4FVvIJpGZZo2+PLFZ2Fg1lBVcIJKwYUctS ZOug== X-Gm-Message-State: APjAAAWEB48BNY3vC2zdBHsip6FoBfiJyWR5qgAjgnb42ANe4MpBK5jW turaWFhVUVCMk/rtT2vE3WClTHEa X-Google-Smtp-Source: APXvYqxZtXlQ0BHQE69xAc56CjhJydNtxtY4XiHY1KyApfxNj6O5tpzWjzchwA8/S3CTIW6tcfzgLA== X-Received: by 2002:a7b:c106:: with SMTP id w6mr106172434wmi.80.1564430622115; Mon, 29 Jul 2019 13:03:42 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b8f.dynamic.kabel-deutschland.de. [188.192.139.143]) by smtp.gmail.com with ESMTPSA id t24sm56602211wmj.14.2019.07.29.13.03.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 29 Jul 2019 13:03:41 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Jul 2019 21:56:58 +0200 Message-Id: <20190729195658.56078-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190729195658.56078-1-andreas.rheinhardt@gmail.com> References: <20190729195658.56078-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] cbs_mpeg2: Drop fragments containing zero-sized units 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 invalid and can be easily detected, so discard them. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs_mpeg2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 559793dc98..eb0e2c7ba9 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -207,6 +207,12 @@ static int cbs_mpeg2_split_fragment(CodedBitstreamContext *ctx, final = 1; } + if (unit_size == 0) { + // This can only happen if frag->data contained data like + // 0x00 00 01 00 00 01 xy, which is treated as two start codes. + return AVERROR_INVALIDDATA; + } + if (unit_type == MPEG2_START_EXTENSION && unit_size >= 4 && start[1] >> 4 == MPEG2_EXTENSION_PICTURE_CODING) { // The values f_code[0][1], f_code[1][1] are used to derive