From patchwork Wed Sep 12 01:08:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10296 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4272373jap; Tue, 11 Sep 2018 18:08:59 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda4m8MpUW4fwE5puNT9HSfSZQPLh4wNxXLiV+p0Y0pnfjuVXoKM4Z43zZNh6k1bdAuI2xdH X-Received: by 2002:a1c:f913:: with SMTP id x19-v6mr3073756wmh.63.1536714538961; Tue, 11 Sep 2018 18:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536714538; cv=none; d=google.com; s=arc-20160816; b=Eqyse7J2N3gIKg/DBxHIQkS0ZE1hcmIY/8JJSTFRYSindw0Ykx8n/eESCEXqJv/vUy hlU7kIPc/GOy3LOlmlt8Mier+KPGMKRnHjkgk6aDfwZ+1v0BZYcjO4r0uBCGotK1cXN6 uFWDimG13Z1KU6mxFGIqKVVlzIlM5uPMZ2M4mOZJnQeydrSX4GDtBvGudPXr48da077n ectBjTubqDsh04EEEp+mmsC7qF0exJVGIN7etPOz8VnXNSGBC016YFQYnYrhJtCy3+Gt sqJ4Cmj73+t7/exO9l5hl6V6prjxosnjIvawSfMfz7BKbQBpUfjWZv/dgQ5mhNGXat5O uGsw== 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; bh=b+ePnNAUKb6k6UnO83ZaFbe6bdHFztE7UEcu6GwN5O4=; b=Lw4LTyH9hOIwR7fVEe8XFVU435M5UPazCJbQs9YIBcu+0585dMgWmkNUArEy6KUMZh xVfcEFYAamelDBDtVWxv/yKQHSaPyw31eiuTJxS4O4hRNFdauBRC7vYbHH8tBzj4Ptfm x/6z40H7paAD+IFr3nuzrQ/TJBmyhpIYX+ThKBolyw6QUsao9I+lghLcWVETF+lj8FbG 35bfvJI8o3SpK8zci7VAzMSng7Ot2SCmVS0uqDn9yfj7yrT2pNaK4dgw5kal11TODNRN wA3guI0Cpbl5iGJuKAAPinstz40866MHgh5lcbHTfZANVKlSJESGJOIEhfL+tRwaHjJM xjDQ== 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 f200-v6si1847780wme.36.2018.09.11.18.08.58; Tue, 11 Sep 2018 18:08:58 -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 AB86B68A4CD; Wed, 12 Sep 2018 04:08:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe02-3.mx.upcmail.net (vie01a-qmta-pe02-3.mx.upcmail.net [62.179.121.183]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8239968A142 for ; Wed, 12 Sep 2018 04:08:40 +0300 (EEST) Received: from [172.31.218.48] (helo=vie01a-dmta-pe06-3.mx.upcmail.net) by vie01a-pqmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fzteD-0004lz-VZ for ffmpeg-devel@ffmpeg.org; Wed, 12 Sep 2018 03:08:49 +0200 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fzte8-0005Zu-Hd for ffmpeg-devel@ffmpeg.org; Wed, 12 Sep 2018 03:08:44 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id aR8i1y00E0S5wYM01R8jKx; Wed, 12 Sep 2018 03:08:43 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 12 Sep 2018 03:08:06 +0200 Message-Id: <20180912010808.31637-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/bintext: Check input size before allocating the input image 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: 9795/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XBIN_fuzzer-5768631928487936 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/bintext.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c index d967317671..b14a2a9c29 100644 --- a/libavcodec/bintext.c +++ b/libavcodec/bintext.c @@ -146,6 +146,9 @@ static int decode_frame(AVCodecContext *avctx, const uint8_t *buf_end = buf+buf_size; int ret; + if ((avctx->width / FONT_WIDTH) * (avctx->height / s->font_height) / 256 > buf_size) + return AVERROR_INVALIDDATA; + s->x = s->y = 0; if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret;