From patchwork Sat Jul 1 01:38:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4171 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp6432112vsb; Fri, 30 Jun 2017 18:38:42 -0700 (PDT) X-Received: by 10.223.177.201 with SMTP id r9mr29625189wra.36.1498873122192; Fri, 30 Jun 2017 18:38:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498873122; cv=none; d=google.com; s=arc-20160816; b=gIXCy6HhdzBM1t1hhsU9QBPIbtgENjRAa6DhatFUwMau3tTDD2XXm9bBvN12wbEedd oNdZVo8aG/eEMEeOcinLaJp+mQ6le1sxy4r1BO5xiXvgkR9pX3lcQxTpkaQEJXULHhAb 9q493umGD9PJW5KWnB75yIWrK+PGYCXXJkA7wcJpDaSRulppIi/P2QjYT4j4WCBGzkTt pCfRYkZGXaO4ySlr2Pevl546Nt6nEXSd6XfLajMXTUVwpJ2WdpMw2/YtnqaBpL28wkJZ n3Ao4qXThJIHjKxnC45lCkAer2PJ7nCx0kLl9cA9Ts8aPw2V9LmXCsIKesuPh3gCHnub bfZA== 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:dkim-signature :delivered-to:arc-authentication-results; bh=U4lJrWzzrbDFfnRjmVnJHckB7JGPzwCGV9Dtp1DqPSY=; b=XYGruKfFFSW7nzcFf6VT6y/Blj23K4PEU1bRDYB25olZCx0eG+4jmBttZo9YKE2MSr B6ts0PGjMqyO887wzPrAgpkUBcZ/5i008E1Tk+KjwxiI0LqwSMu8oLBrrbGT6VkeKTBt r8kNwZKkpjCzhldq90UHxeyy8QrrZPqZiG+UohpfQsdI+FGOAfjZ587RyES96NhqxUWK GUjAnHk1G9tAZRdEtnqQfPfUZjsRvkxWUF0jmV7ezl5bM127kz4hLwsNZSEDucEncruH xvmY/oZ0xTop1za7Sn9JariyMnCoOZv7LVUfx3zWHILtt+zoVugMlRlxujHsj73lL+/h kwrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=r46axnUr; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p34si7196994wrc.158.2017.06.30.18.38.41; Fri, 30 Jun 2017 18:38:42 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=r46axnUr; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82223689201; Sat, 1 Jul 2017 04:38:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A17746883E2 for ; Sat, 1 Jul 2017 04:38:32 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id u23so10582368wma.2 for ; Fri, 30 Jun 2017 18:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=0xiMkreZveajOKAFgcpPedeDxywYjwvijxHd6PAx414=; b=r46axnUruPCTsA7TfuJnX75jFdiNgHx38avm7by4SzNO/+VClC69UPrvI2aRalGFP8 Y/pLySqbx6HhDKQJU410XZXFgYSJCS3tjzTXgLZOJ8Es8tUq3EPkcUqjmZS0I/l86ibt 2SnqrXEcpA6jkhocHl/4MEWkpieRExvxkLzefUeSfRa1mLdcDH7MvxI1lIrg8fkXpHzx GQ0dDFpa8UpEtwZle1N0qJx7Ay3Za2WYEXZxd3dCCREtnw/N7E4v2wd4YTDUxEZWP97S RbcAxksTcNJD3H+ShLFxaguG6XuF41O52r/ioiGSGLY9zSr7vK6tQMwEt6AJI6KR7wTO yR+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=0xiMkreZveajOKAFgcpPedeDxywYjwvijxHd6PAx414=; b=g9eElJplUefEaV0BDAoOaxilLdZeV8wtihX35ALrk+k0Jxv00hu1TWM9P10ms7JVYx xA594o0XeC/ZjqCumT31dKFtfex6FCp5yoPBtEKeV7qTh0yWHFJrB+U+u95ee+lo3+rU 5NUyWimlt5r3mBv9AFIK/cDMmOCabiT+dleKL7qUHR0DtxlJcVf/iCNqT1NOPtFvVRwE +XfpjUWeImtiH43ugdgu8RXJAhk+xLb7svaKnJ3JrGKBHie5VulNblh5EyDaqYpJIlm7 M3eD/WafvbFB01qpQOSnrW/HhEoC5YzTYvDipVUC2XVhjvJyznZy1WJck0dIrk9TceMa PIzA== X-Gm-Message-State: AKS2vOxU/oYG76L7GWoK2kmucSVU6WAck2RSq7dGd8HdKzEuEdWLrrgY PCW+k3Ui8zm5psly X-Received: by 10.28.137.146 with SMTP id l140mr16415379wmd.101.1498873112747; Fri, 30 Jun 2017 18:38:32 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id a126sm5040114wmh.14.2017.06.30.18.38.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 18:38:31 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jul 2017 03:38:21 +0200 Message-Id: <20170701013821.5448-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/alsdec: properly allocate raw_buffer 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" This also reverts 18f94df8. Fixes #5297. Signed-off-by: Paul B Mahol --- libavcodec/alsdec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index d95e30d..4a8f13d 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -705,11 +705,6 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } else { *bd->opt_order = sconf->max_order; } - if (*bd->opt_order > bd->block_length) { - *bd->opt_order = bd->block_length; - av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n"); - return AVERROR_INVALIDDATA; - } opt_order = *bd->opt_order; if (opt_order) { @@ -2062,7 +2057,7 @@ static av_cold int decode_init(AVCodecContext *avctx) channel_size = sconf->frame_length + sconf->max_order; ctx->prev_raw_samples = av_malloc_array(sconf->max_order, sizeof(*ctx->prev_raw_samples)); - ctx->raw_buffer = av_mallocz_array(avctx->channels * channel_size, sizeof(*ctx->raw_buffer)); + ctx->raw_buffer = av_mallocz_array(avctx->channels * channel_size + sconf->max_order, sizeof(*ctx->raw_buffer)); ctx->raw_samples = av_malloc_array(avctx->channels, sizeof(*ctx->raw_samples)); if (sconf->floating) {