From patchwork Thu May 25 01:21:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 3732 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp579998vsk; Wed, 24 May 2017 18:22:06 -0700 (PDT) X-Received: by 10.223.135.216 with SMTP id c24mr21671196wrc.109.1495675326823; Wed, 24 May 2017 18:22:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495675326; cv=none; d=google.com; s=arc-20160816; b=uocrt8EwFY1JtZdsxxgcCefeUXQ+mJe8u0ybUUcWQ3Opd4qFPKnaR60FIeWmDZWK0E 0leCBJ32KoQfD5aW4S/eK43HN5kB6/QIQ0eHc4RzUDw3/uBygmBAgjUFtTb4wleqSk2P 8ptosIISmXJceF6hFM6Vy2feFgvOLqrvdHoM6KUYGYT6F1sL46HFc0/0/zkzpuszQm+T YCiMiHZyMsjzj53x34GzZfl3lolnFu6lryNUnPR3euU8vOyMc0TzcGHDgEnjv3/63QCX EfK1gEUrSKsJKesFNaUE+2f2YyohNFtByqwgcLYLNDQS23mfqa/P3fIZymrrq7v2Tc4d 3T8w== 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=Gz5PSw/AIj0JyCjzLOxlHuuFmtAFcLDakvLcN5J1zGc=; b=Yx7UEeKIjV9wBaa3bs+r5FHzu04IIsxDUUS3Gc+/Em/0rrnyqStu/gTtgHoMvkVQlY UVoumEAvjbIrgmJnXCzjiZWmgKbOojroKB6cQEqvtXSbgQDHLdHQZ3l0Hs2hnNZA0SqD n86f92b3AAJUssaYzKalinVPT1T2PNvqfM4KGkt5jfUFgtaNxndSHXGtf/7LP3ceQvyo +uycedGMQmaptweRoOXerwZZhihrY6+SpdV/hrbmesusR+KmuehyC7RaKdf/n9yRtQX4 kjoTERYO2xMU/EhDx+TS5rt19n46FKd9lCd8I5J52XGwSq0X0qZyP6pOzAFQGYnF3RVG Va5Q== 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 h63si6351245wme.64.2017.05.24.18.22.05; Wed, 24 May 2017 18:22:06 -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 D790E688398; Thu, 25 May 2017 04:21:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-2.mx.upcmail.net (vie01a-dmta-pe04-2.mx.upcmail.net [62.179.121.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E970C680460 for ; Thu, 25 May 2017 04:21:52 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dDhTO-00051H-Rg for ffmpeg-devel@ffmpeg.org; Thu, 25 May 2017 03:21:54 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id QRMr1v00x0S5wYM01RMsf2; Thu, 25 May 2017 03:21:52 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 25 May 2017 03:21:50 +0200 Message-Id: <20170525012150.15508-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libfdk-aacdec: Correct buffer_size parameter 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" the timeDataSize argument to aacDecoder_DecodeFrame() seems undocumented and until 2016 04 (203e3f28fbebec7011342017fafc2a0bda0ce530) unused. after that commit libfdk-aacdec interprets it as size in sample units and memsets that on error. FFmpeg as well as others (like GStreamer) did interpret it as size in bytes Fixes: 1442/clusterfuzz-testcase-minimized-4540199973421056 (This requires recent libfdk to reproduce) Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/libfdk-aacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index e5f7c4ebdc..2857b9453f 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -325,7 +325,7 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) s->decoder_buffer, s->decoder_buffer_size, 0); + err = aacDecoder_DecodeFrame(s->handle, (INT_PCM *) s->decoder_buffer, s->decoder_buffer_size / sizeof(INT_PCM), 0); if (err == AAC_DEC_NOT_ENOUGH_BITS) { ret = avpkt->size - valid; goto end;