From patchwork Fri Jun 30 15:31:48 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: 4164 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp5904643vsb; Fri, 30 Jun 2017 08:32:33 -0700 (PDT) X-Received: by 10.28.211.10 with SMTP id k10mr5868043wmg.117.1498836753015; Fri, 30 Jun 2017 08:32:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498836752; cv=none; d=google.com; s=arc-20160816; b=zpE0XdI/lOBBj6l59RX18f+GlQA2zvFAlBv4oOzeMUoBW1biuyX7xg3pSFILxWFxd2 c3NHmok53H5aPCVEXUQU/NFKn6b7+GWv8sEhi4jrzFlxZ8+ZCgyk3e+wT2A30GvFCoCT WAR7AgA1XN1kBNEBvBjRxK+GSwJm1OXrysFIQ+JPJIYCGXQOhIhm+Uy4t6thrpjg1/af fS+gnOGRWM1OCmutq0qIJWtHNFlIYjzA834NrusxAZTYl+eZsq2IC14CE0xxf8XchMBf MKibTizwoJ/vG9INcKjOIrwXgxPZrLQIYgooz2bCkkROzsyyBeYVVTeshAYIoz8gh0HP Gpcw== 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=ULRRu/wozigqPR2Ba6E7QK36/SzP4s2nGkeX9uCDQMQ=; b=SXGt04fi5sJ9iSS6DY+2K2XJrcSWcCfrOB0ivjJSTfBym44MMUTzaiVSj+udVbp6sG WqKlfsULZzdyg/cJ6swSCPyKruiJE2JTKW/Y7pBh0NWIFB12l+TbSBKLt21jTdWa2kJS ag+o7h8PKYyKxqWQ9flE2S5/JHMGbBCWDx/QQswvfr2x4peheYVp3cS9DnYR1FGr74mq d6TqVnJHTCFffv8yg/k/Xd/9J5UUx0M35aDKnGmDXtz3I1JyuIwhb9tH78t1MwZ/1VSs +AFvzSC2+cBFm+QNYFQ7FHJrlkMKMcnYbuhlACXnK8moQZmbvybWDSEIHgl74TKgsUCl Ff/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=mV4RDl7J; 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 u18si6517903wru.73.2017.06.30.08.32.32; Fri, 30 Jun 2017 08:32:32 -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=mV4RDl7J; 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 C8D5E689FF5; Fri, 30 Jun 2017 18:32:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D21E689FCD for ; Fri, 30 Jun 2017 18:32:23 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id p204so8623089wmg.1 for ; Fri, 30 Jun 2017 08:32:24 -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=Q96IqpoHSHUeLbswwzYz4pzb1BKLkYslMoouJ/QaAnk=; b=mV4RDl7JDVKBzaMecWYzkHpPAp9pjpb5Pt2XDIx4VrENPQZyw9ha2QCjseW6uDHnez yVBQ9vn5eD3i/bFtaa1wrYNPcX7MkIOAdPfh7k+6GyoG+9FgCCxFGM1a+DYodka1ZWo1 Ld9qrb0BPWNs0TeIcY/lOAPwn/W69LPLXXvHMZQHN739V62t1lDW/1nmXf6h9L3W+JGU FvYKofg/I6h8rEODq3azeEWaYwFeZ72/QB87aG9de2xhK8E9yfQwr4xQfhvkDYOMV/Ok SCPbKxsrKovaQwFPB7sK8hdlGSp/+eO9LiVpGNHQ7TYon5lay4LcpUHYEPVzdbjlUYuZ VNaQ== 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=Q96IqpoHSHUeLbswwzYz4pzb1BKLkYslMoouJ/QaAnk=; b=NCwrckVY4nzNNNtA7TYl2/77DZ/tqFPIB0lRKYIlgH6eJiFEI4oWq1VJqLcdkfLN7a CgbLKPMCkHdwQ1PhdiqyYYuTINdLL9ruRbx1WMWeNJNN9aajdugEuj2Nm/ZeS8BETFuN qVwBrzCaHk1+41Zgw1cHU6Es43x20UDEsyvffvliSaCwHz2P/biPPoigFIzZUOADZ1L4 z2kBjs4YVYAK4CvVegYEPzP1P8U4u2v8D7aQqzsQVBPtxV6sAV7lJvC+KWnJFBK9O6zm 6eyQIFDJNiykQarE+kur3G3pffip4zqNTJY+kGjIzc2ce1g5/a5W6cW7c/bh0xPzxC7g jNqA== X-Gm-Message-State: AKS2vOy2MtjVD1WXY2kbJN27P7a7WdbJKexVxPIUgJhbvP/+IbTb+ve4 Oh9pcjP1A6MdSb+i X-Received: by 10.28.29.9 with SMTP id d9mr6113076wmd.39.1498836743441; Fri, 30 Jun 2017 08:32:23 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id m123sm5134278wmb.3.2017.06.30.08.32.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 08:32:22 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2017 17:31:48 +0200 Message-Id: <20170630153148.2342-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] Revert "avcodec/alsdec: check predictor order against block length" 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 reverts commit 18f94df8af04f2c02a25a7dec512289feff6517f. Signed-off-by: Paul B Mahol --- libavcodec/alsdec.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index d95e30d..209feb8 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -705,11 +705,7 @@ 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) {