From patchwork Fri Jun 30 16:43:18 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: 4165 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp5978639vsb; Fri, 30 Jun 2017 09:43:38 -0700 (PDT) X-Received: by 10.223.133.186 with SMTP id 55mr29516413wrt.102.1498841018620; Fri, 30 Jun 2017 09:43:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498841018; cv=none; d=google.com; s=arc-20160816; b=jairnvMD3WXsUuzhHhYT/7KIaNdJ6+CBKlUOpZOHRIsRo6TJxkbR8H/ttL9GAO9Ri/ t8lyLdYILe5EtXrtR8cYkvpDZe1dQDF9gWR+mhP8xvLj5nMRM2CMPIbyq4H5LYpgGlbR wN26Ii2mrd+4zy3r4j3FT5oTaAaWJqcj+W9cd6uIO/gl/r8whhL7Jcx5u+VmICg4y4VO W2FRIl8NBJUBAk27IUT1hEfXnvJjTk1Az4Bptv1EM2XdiLv4nD+B4gZH/a2bF/4Od/nh E6LJskAO6E0VP2cH3rrm9WSeSBZUPH1xqP3Urw9K0s9iXz/ZT46PfQkT4+lsTn5XaFnC jIGg== 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=QfIm1RKbmRIAmV68uBaeRbQS5NVm2i3TMbi1XxWrBPc=; b=gXW51AzNB+iXJuvnGkHeM/j7xsOqJxMMEiMvaCmbwGazswuuOSsv2W31VMWrnDo/Sq YOmpQZlAeCvHvEbNDAHUxkstgZ1KSsS2sx8qPYWgl4QZdzCeU4t9Z9swYEKJ92wkJg3Q liqNY5CNj80DglXoJHHl6VMnP5IWdWepu61chGOmcRqcl56lDt6B/77imkrXAAHSDqzz bE5Ye08Trg9kAoqxwcoWuFmqcSULSd+pzSGG8/1/P1baReBirchdtrxTHW3jorDkPGoD o+sJb5/40j3dn3EtsdDoBWDYE8dMagMa8SvFiQB+W/Ph4SlZy4tCzvsIKQrpOdrq8TEx 8nzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=ONtF+9ck; 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 x76si4163063wma.40.2017.06.30.09.43.37; Fri, 30 Jun 2017 09:43:38 -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=ONtF+9ck; 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 B8BA268A0C8; Fri, 30 Jun 2017 19:43:34 +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 CB02B689B7A for ; Fri, 30 Jun 2017 19:43:28 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id y5so8912420wmh.3 for ; Fri, 30 Jun 2017 09:43:29 -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=7dN6JOfP7KvtKi+ohW5XRBevqeRYqtamSR8pNWF4dv4=; b=ONtF+9ckEtYt5avfQODKINCObVPCFu1pqsmdLkaB7ICOxRFjQeIJeP17hWOal/m+hM fOai2XVzBuTlFtGSYQ0zTeAzYrrQPCuddz/X4tj8a3intUngfTWqTenGeE2hqxogt7Tw ob4NBliiJHmi4VmPT59uz39dnUwVzuuWDDLo7/2AvPy/k9VG/iGotKwp0nSZlidA7M9R jhvJ6cnqF9VZPoi0A2PKwTw8/G8POz4k1uIBBKd2xQGgM2h7U/IcrY3dwvG0fYnFTCcc J+baydHeF/CyfjP+o7JlTBiDbxJEw6H6QJs/zhyItJ7duAV4yVACgJMfjaTmGbvWngbT OsgA== 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=7dN6JOfP7KvtKi+ohW5XRBevqeRYqtamSR8pNWF4dv4=; b=sw7okVKrZuoLAzEUutUqtaP5LpPKShVLjkQ7+4MBGayexmCSPwZhLn4eu8H9KVEzXp qJ+lN3raWM0SrZ1Kghie9NbhLRTWtR1uqvjSGz6aiGZlZETHFEKKt4y4m4aPWlFbJXhd hRsApSCRPgkuXWD6+8p+ym8eXkvo4rWXDnH+SFi8EYLWfbJgqUpKjU/UwBikEEYegIwu iKKgHOAF87N9/m+2hxyqQ61j8tYS6AGiNKEkDe1zEUJMQteJjlgR8qhURlL+46dKWICc oVeUmNnxwSKUKOwz36c2ecn/frNzxNynQZyp1BUH6XJYbOeceyjRREqvzfFf/eVxyb82 Ad6g== X-Gm-Message-State: AIVw1122cKDHNs9eN16oNoR1ttCS4qPsBVwBK1ckK4zMRtPKjOcaikXK pPF6gp/bLNWVlfJ8 X-Received: by 10.28.87.205 with SMTP id l196mr7924757wmb.121.1498841008680; Fri, 30 Jun 2017 09:43:28 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i65sm4163942wmf.20.2017.06.30.09.43.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 09:43:27 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Jun 2017 18:43:18 +0200 Message-Id: <20170630164318.17052-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/alsdec: use correct variable when checking for overwrite 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 #5297. Signed-off-by: Paul B Mahol --- libavcodec/alsdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index d95e30d..a925502 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -705,8 +705,8 @@ 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; + if (*bd->opt_order > sconf->max_order) { + *bd->opt_order = sconf->max_order; av_log(avctx, AV_LOG_ERROR, "Predictor order too large.\n"); return AVERROR_INVALIDDATA; }