From patchwork Sun Mar 11 23:32:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7927 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1004301jad; Sun, 11 Mar 2018 16:33:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELteIPSyKomQthv0X+UXp8K3X6+hJL4VaNku9yd+YdcsCr0cZ0ndedEd3l35BXO8OTz21B2Y X-Received: by 10.28.143.148 with SMTP id r142mr3998061wmd.124.1520811202469; Sun, 11 Mar 2018 16:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520811202; cv=none; d=google.com; s=arc-20160816; b=KyywCol+W7fwCZOXXR0FmyjYC4L91SKDS4De3dHMpL+X7/5+jAM+yz6nKizarv3Kis s4xg94NUtLQeilQOd1lFEPMfwn1LzStujWtt850oA97a/SNL16UoAIuAJDEXB80qH6uY sD8j0Wiwt+gQYVPZ4q8SL8inq8Oh3z5sC52tVjvqAXwsQyRTUCUIWX1+2wjovahdU2jg DI1Zb7BFgyzIRrI/+e/JSJgShNuPwCtua7oRyOCAM+h2+kvdxC9nh6mL3M+chdXy3jRj tk41Mlu/Vun4nYEBtHeyNVQKZ7j/+KxPDK2OvMcGoWuOP/iONIPDsbPN2uWTev4gfxDQ eoeA== 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=51gHMVcjdWt+hlk3wPqRQExwv0CDQYJuyAo4jbYOzEE=; b=PFJgxXyCyxnAhPAv3yI/N5nTIC8Z5Xwh8HmXlb8dn15C42/fBneUDNU9ZJ19L2s7ys aUK7iTbBdWCEn9m/jnHLfKP9FhzR9ln45APyql4JZIhJh58lb8UFT6iJg+dpwOgptISU P3b5g/dS4Zb1Mc7BH+UWq6I5G672/FtoiBhIWhmIzZ8USw7iOZoSP/l2a9CPQebRPcsj v3+4Jr2Lmh+fONQZ0d+ro7lci9PobtK/R5ONPJYjPUO2Wbsh5Yop2fZFdQqD3tnuy97p ifn4QT0QAlWnKjJK9BpSBNq8/4K+UL9DiUaIMOOcL4nzb5obfXKDSIjxdCvv4hPM+ssN SbPQ== 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 6si2415123wmn.5.2018.03.11.16.33.21; Sun, 11 Mar 2018 16:33:22 -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; 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 2A6BD68A1BE; Mon, 12 Mar 2018 01:33:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9906768A0F9 for ; Mon, 12 Mar 2018 01:33:03 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1evASn-0006PV-C0 for ffmpeg-devel@ffmpeg.org; Mon, 12 Mar 2018 00:33:13 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id LnZ41x00E0S5wYM01nZ5ej; Mon, 12 Mar 2018 00:33:05 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 12 Mar 2018 00:32:53 +0100 Message-Id: <20180311233253.23631-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avcodec/cscd: Error out when LZ* decompression fails 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: 6304/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-5754772461191168 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cscd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 9e1dec9d96..35c4ee08c3 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -81,15 +81,19 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, switch ((buf[0] >> 1) & 7) { case 0: { // lzo compression int outlen = c->decomp_size, inlen = buf_size - 2; - if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen)) + if (av_lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen)) { av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); + return AVERROR_INVALIDDATA; + } break; } case 1: { // zlib compression #if CONFIG_ZLIB unsigned long dlen = c->decomp_size; - if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) + if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) { av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n"); + return AVERROR_INVALIDDATA; + } break; #else av_log(avctx, AV_LOG_ERROR, "compiled without zlib support\n");