From patchwork Wed Nov 15 20:17:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6103 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5002406jah; Wed, 15 Nov 2017 12:17:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMY8PDhagYRvAu3K9iqBfdtfBRl1JCzQnTpyaJMvJpjjgCqdVwrDFpmlDPjKkNrmED1o5XnL X-Received: by 10.28.148.15 with SMTP id w15mr12274696wmd.140.1510777057085; Wed, 15 Nov 2017 12:17:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510777057; cv=none; d=google.com; s=arc-20160816; b=JVr89jJBTJPfCMND58ISWWEkGoatk4pQ9UsazRp8gMNSW+S+xVY2v5883qciHEcgr+ j9NzlKLn0KOotzjPxh/JV8w8HmkOpFke9tWdEAnRf0hZjEs+GBEoPliYinoDCznLgC61 4GPnSavj/HYM1VKNlL8vaYzSyKknRlYxL2S6+tXJIpbj9qBcCu6wj5UKLtXUnNq2A6oe 62XZhHP5sxN5NLw8yz56K3PpjXD6IfIS+Qathmky7sbV3PkYyPALOcOJFqytPvnKvomC Vey7qJZElFtQQSOjWJ0xezIxc74lKBTzOXbFxdSJEKOuvQnx4/HHIgib/wRVioGNkprx Qk3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=NpkyavBkQL50YEYpHz74o9zS6pK7+gx8fbFBZ5n3GNk=; b=UjJ/zvRCitd/a4P11eAVBVVU4qeZZK+MyD3ILHILzWjsyNJjgOr/jo6qsQbGlpF528 NO1O8RXvc0uRuzd/+80qHFUgOnz/kOaSGljKI+jX0xj+IRKoE0dCYqSa8sB6eclSHqIl /DOUjtsW0ED3xCJDIVqdnIRTN/bRCYW1aFaB63ZcGQzGYViWvXfSzE7j1PfIeuYNWuzD kARZMtexSmk20XrTsErJXnyDGUnbyZ4tCiNSXLGp3rENPmhuF+N2FVr1S09qBi++nZkD n/KqkF8zqkdayhLSJHBbmAFNUcVTjzJOrjcd9h2IQP04j4Jg9a8dVuNToJjZeM76B1ko bjEA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e204si10107755wma.128.2017.11.15.12.17.36; Wed, 15 Nov 2017 12:17:37 -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 64F0D68A0D3; Wed, 15 Nov 2017 22:17:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57125689FF2 for ; Wed, 15 Nov 2017 22:17:08 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eF47f-0007Bv-IR for ffmpeg-devel@ffmpeg.org; Wed, 15 Nov 2017 21:17:23 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id aLHH1w00L0S5wYM01LHJK6; Wed, 15 Nov 2017 21:17:18 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 15 Nov 2017 21:17:15 +0100 Message-Id: <20171115201716.2924-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/snowdec: Check intra block dc differences. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: Timeout Fixes: 3142/clusterfuzz-testcase-5007853163118592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/snowdec.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 727e908fb5..77ffe7f594 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -183,13 +183,24 @@ static int decode_q_branch(SnowContext *s, int level, int x, int y){ int my_context= av_log2(2*FFABS(left->my - top->my)) + 0*av_log2(2*FFABS(tr->my - top->my)); type= get_rac(&s->c, &s->block_state[1 + left->type + top->type]) ? BLOCK_INTRA : 0; - if(type){ + int ld, cbd, crd; pred_mv(s, &mx, &my, 0, left, top, tr); - l += get_symbol(&s->c, &s->block_state[32], 1); + ld = get_symbol(&s->c, &s->block_state[32], 1); + if (ld < -255 || ld > 255) { + av_log(s->avctx, AV_LOG_DEBUG, "Invalid (Out of range) intra luma block DC difference %d\n", ld); + return AVERROR_INVALIDDATA; + } + l += ld; if (s->nb_planes > 2) { - cb+= get_symbol(&s->c, &s->block_state[64], 1); - cr+= get_symbol(&s->c, &s->block_state[96], 1); + cbd = get_symbol(&s->c, &s->block_state[64], 1); + crd = get_symbol(&s->c, &s->block_state[96], 1); + if (cbd < -255 || cbd > 255 || crd < -255 || crd > 255) { + av_log(s->avctx, AV_LOG_DEBUG, "Invalid (Out of range) intra chroma block DC difference %d, %d\n", cbd, crd); + return AVERROR_INVALIDDATA; + } + cb += cbd; + cr += crd; } }else{ if(s->ref_frames > 1)