From patchwork Wed Jul 26 18:29:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Sugino X-Patchwork-Id: 4465 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1098203vsb; Wed, 26 Jul 2017 11:36:19 -0700 (PDT) X-Received: by 10.223.163.158 with SMTP id l30mr1766719wrb.203.1501094179070; Wed, 26 Jul 2017 11:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501094179; cv=none; d=google.com; s=arc-20160816; b=vKaoXouaERB5mKGpUOKctnjF0E7MDNuL65ADLmXYZ7aZ43y6kuqhnInGUO3GxRDz7K hKo3NGslxeTpWznKWKJzoZmQnuLgEzlBOW1BfRtwQa2qpBqjAoHZ6CXbEZLKE1F1trAV DCT7DXA/lInjfb9jldF6l1cCX5Roag0YN7HDDtaHa4Jb0Y+2GNO4yXn55FFyKCvk+aEm g6KMaP4Djp6kLmwxDx552kGpY48fgoIxPPWsrVVW9Ewzb6BE69Tw4TzHJyzyIR/aVB+4 BlFCfL73h6N3HYEu9ZFNoRL/92WqqGLs1zue/rBxFTvBBCJ3XrGmfyMu78vXnKx7wIt9 Zc0w== 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:cc: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=z/m66rPnareviCh3FuwYpz/YOAP3booFO+zFLWs24gk=; b=DPJPsraf9Pj3g4QueXUtQHFzhzVwq6RZaW3TW65Uj6lHRbfsolnMMrcLSLaLm0Vlgl 4mGcvRFIsZpPdy6NjdH/3ruEzIV9ilXEHUw+jfGlefcfBWk4XW6/CTcdJomYtIXEq1Ss KGY0dU94bcRPQkSxJww0Z3vIRHqCq4kod/MRpnNaYF++S+v1NYsoij5TNhKjyjQtfVLR ifAegbS75DwHajXbHEmEmUykTojIxzZkfxhJefgJYJGCl3CdbCmTedY0tdGfD+OM5pWL /dyd2MoRxGNdwXw+JqI3iSG9crl19OvAe5OYxd7AzVi4a2QNxNrulcprY1krdpcNWFsO x5sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@3way-com-ar.20150623.gappssmtp.com header.s=20150623 header.b=Sdzsf8O0; 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 e187si9784937wma.252.2017.07.26.11.36.18; Wed, 26 Jul 2017 11:36:19 -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=@3way-com-ar.20150623.gappssmtp.com header.s=20150623 header.b=Sdzsf8O0; 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 6482C689AC3; Wed, 26 Jul 2017 21:36:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F287D689953 for ; Wed, 26 Jul 2017 21:36:07 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id x77so1527042qka.4 for ; Wed, 26 Jul 2017 11:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=3way-com-ar.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=7+yAg6cIdRmv3ggPUdH2BDyk80sfdeQw1Bk9/ZJBTB4=; b=Sdzsf8O0Fo8tiM8UrCx6ThlQkL59RKZ/8Y3CLSSBLXHRR3167xV6pysNNEshAmnp5q FikT+ymtWbyVktjLuasXxoOInsjNQLcKJ/7H3MnlekuoHZC9NhZe+7koVu0CGgG3GGZW tzKlS1YlQWKrnCSJ8xArPrG9pio0J4/yqIz0oXtq/I8ThZzH/lDJ+bi0LBsNGi0MT9KO 7chrORSggtx0lwuAXYf4EWU7uK2iFDf9eiEgBkKY7PbFAWEp5lrF3cODH+1A7Zq46xFQ KpRjZ3Kr7rZGC/kIz3+usoBl7kjOexk6vra2wvWDEoZuKS14poFQphfAu0af4rBuxKDu cn4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7+yAg6cIdRmv3ggPUdH2BDyk80sfdeQw1Bk9/ZJBTB4=; b=Nlp0m2m9Gk9p0d2ter3ZV4Tr7CV66DlXPsCTVLUph1b7C8l4/QbKfM2gVVjDOr4huH dY9bMCL6JmGpbjhO6274qw9/+xoYS+YpG4ZWYBg3iY30JjoGem4A0Gzp3GaUcX628Hi9 YwAr11TpVWLX3qRpSPqIx9yrJ6i8lMZxildwPVn7UQWfDinsb45zjm0JCQ0Dn3Gbv5Qo YSa7VIfnl4Gw602fXBALRY6xaLob6nP929YOsJB2VOKTVgk9o27pZaanmvmCixDmELa9 pQq6B/cX9YuoEVBsVemX/37DL9FIQGHdEevk5A7y4AetF+mYMbBM9BYNJAob65iLvQx1 37EA== X-Gm-Message-State: AIVw11382luUUZq3u+axExTpBrqkI5XBkmvODHjhsdBe07TLf0ASgSi8 u7dgUkpM8uPe4f+c2RE= X-Received: by 10.55.131.65 with SMTP id f62mr2378342qkd.290.1501093803051; Wed, 26 Jul 2017 11:30:03 -0700 (PDT) Received: from localhost.localdomain ([200.127.66.97]) by smtp.gmail.com with ESMTPSA id i50sm12519516qti.92.2017.07.26.11.30.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Jul 2017 11:30:02 -0700 (PDT) From: nsugino@3way.com.ar To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2017 15:29:02 -0300 Message-Id: <1501093742-27636-1-git-send-email-nsugino@3way.com.ar> X-Mailer: git-send-email 2.1.4 Subject: [FFmpeg-devel] [PATCH] avcodec/aacdec: Fix PCE channel_layout verification 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 Cc: Nicolas Sugino MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nicolas Sugino --- libavcodec/aacdec_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 90cc143..a539f74 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -763,7 +763,7 @@ static int decode_pce(AVCodecContext *avctx, MPEG4AudioConfig *m4ac, if (get_bits1(gb)) skip_bits(gb, 3); // mixdown_coeff_index and pseudo_surround - if (get_bits_left(gb) < 4 * (num_front + num_side + num_back + num_lfe + num_assoc_data + num_cc)) { + if (get_bits_left(gb) < 5 * (num_front + num_side + num_back + num_cc) + 4 *(num_lfe + num_assoc_data + num_cc)) { av_log(avctx, AV_LOG_ERROR, "decode_pce: " overread_err); return -1; }