From patchwork Mon Jan 23 12:49:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2296 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1220740vsb; Mon, 23 Jan 2017 04:49:35 -0800 (PST) X-Received: by 10.223.150.118 with SMTP id c51mr22487015wra.190.1485175775552; Mon, 23 Jan 2017 04:49:35 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 3si18697434wrr.176.2017.01.23.04.49.34; Mon, 23 Jan 2017 04:49:35 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F5B768A244; Mon, 23 Jan 2017 14:49:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B359689D62 for ; Mon, 23 Jan 2017 14:49:13 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cVe3o-0006rv-RO for ffmpeg-devel@ffmpeg.org; Mon, 23 Jan 2017 13:49:24 +0100 Received: from [192.168.1.3] ([80.110.107.246]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id bopP1u01R5Jzyoo01opQue; Mon, 23 Jan 2017 13:49:24 +0100 X-SourceIP: 80.110.107.246 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 23 Jan 2017 13:49:23 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701231349.23455.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/svq3: Fail for media key encryption 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch responds to ticket #6094, pure guessing. Please comment, Carl Eugen From 4d9ca2ef2c455381509a1538676f9aea91de95a2 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 23 Jan 2017 13:39:56 +0100 Subject: [PATCH] lavc/svq3: Fail for media key encryption. Fixes a part of ticket #6094. --- libavcodec/svq3.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index e0747d5..5b99656 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1070,14 +1070,16 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) av_log(s->avctx, AV_LOG_ERROR, "illegal slice type %u \n", slice_id); return -1; } + if (get_bits1(&s->gb_slice)) { + avpriv_report_missing_feature(s->avctx, "Media key encryption"); + return AVERROR_PATCHWELCOME; + } s->slice_type = ff_h264_golomb_to_pict_type[slice_id]; if ((header & 0x9F) == 2) { - i = (s->mb_num < 64) ? 6 : (1 + av_log2(s->mb_num - 1)); + i = (s->mb_num < 64) ? 5 : av_log2(s->mb_num - 1); get_bits(&s->gb_slice, i); - } else { - skip_bits1(&s->gb_slice); } s->slice_num = get_bits(&s->gb_slice, 8);