From patchwork Sun Oct 30 20:24:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1236 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp69106vsb; Sun, 30 Oct 2016 13:24:21 -0700 (PDT) X-Received: by 10.194.137.15 with SMTP id qe15mr10237216wjb.16.1477859060907; Sun, 30 Oct 2016 13:24:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l90si3153416wmi.65.2016.10.30.13.24.20; Sun, 30 Oct 2016 13:24:20 -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=@googlemail.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; dmarc=fail (p=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C357A68981B; Sun, 30 Oct 2016 22:24:14 +0200 (EET) 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 42E79680CC1 for ; Sun, 30 Oct 2016 22:24:08 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id c17so15707001wmc.3 for ; Sun, 30 Oct 2016 13:24:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=W88oH+tDC3hD+5co1AZsUeZZs+WCkQuv5rFYn5NCxKw=; b=L6fDz6yU1zq7NfMP92r9OhrBVkO4swTGh8j8zXHrhipDu8TrJpHRN8uz48ZSEEBxBr diM1kK8xaUD/1JTuPMd9zHIB+AClJQcbi3nUMwqgfEy91vSGOhsUIvwe8S4tTAge/BCo +Cr2jGXvD+D9smYLdHh0eDsycDtEiNKzwnRUCqu6E+4x/iHXMMmG/gtwEN07zEvOIzBV mAmjxa1usU1moBalsSmsHFBClXP1d7x73BLg3WucjIonJ7UlnWQ0+mgsBGs134QiTRaZ vy1HESXvY2dDDrtAOcPf15JUM5ZZwVWaHTJPb94p0nyzqYhpKSMK9iMXBqBZ0Lcx70xI lvZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=W88oH+tDC3hD+5co1AZsUeZZs+WCkQuv5rFYn5NCxKw=; b=aD2xAUGvBl1KaBBeY3W3r7kSJdj9kCiv6nEo5ldtx5CSZOiyG5ROA3IkpTQQT+0I7D uxHFhHgq8JNnK5+u/B1L+VcVYXR+vqbfhFpC4K5pd78AmBXh+1YRhHzU7qSxDaCFLd29 ttxzvFa8MQzdYoV4dTtN2A/mtiPRlMyIxAhMRhkGmjNeGJcHLfvISgHkkq6QxANDuJo/ 0cAck5phsvhgqMHNMHeMx0KZHtqSMa91VTchkSVUOfiNB8m/47qBEctrzMaMjid8gRre BkqZhwbZ0h/dfxTYUap+rCwzNkKkUWXoMmbNVhHPU1mv7usXqh8vuegd/pLTGF7RG+ps RH7g== X-Gm-Message-State: ABUngveudFD8S1idtGW6SXajFMI111QcluZTADN8mBeT669MrFLhFDd99a4qoZq7u9ZJTg== X-Received: by 10.28.126.193 with SMTP id z184mr7305047wmc.87.1477859050861; Sun, 30 Oct 2016 13:24:10 -0700 (PDT) Received: from [192.168.2.21] (pD9E8F048.dip0.t-ipconnect.de. [217.232.240.72]) by smtp.googlemail.com with ESMTPSA id p184sm21095633wmg.3.2016.10.30.13.24.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Oct 2016 13:24:10 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <84531d48-b0f2-07d4-57fc-7f972d49574f@googlemail.com> Date: Sun, 30 Oct 2016 21:24:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes out-of-bounds reads by the bitstream reader. Signed-off-by: Andreas Cadhalpun --- libavcodec/interplayacm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/interplayacm.c b/libavcodec/interplayacm.c index 0486e00..f4a3446 100644 --- a/libavcodec/interplayacm.c +++ b/libavcodec/interplayacm.c @@ -72,7 +72,7 @@ static av_cold int decode_init(AVCodecContext *avctx) s->block = av_calloc(s->block_len, sizeof(int)); s->wrapbuf = av_calloc(s->wrapbuf_len, sizeof(int)); s->ampbuf = av_calloc(0x10000, sizeof(int)); - s->bitstream = av_calloc(s->max_framesize, sizeof(*s->bitstream)); + s->bitstream = av_calloc(s->max_framesize + AV_INPUT_BUFFER_PADDING_SIZE / sizeof(*s->bitstream) + 1, sizeof(*s->bitstream)); if (!s->block || !s->wrapbuf || !s->ampbuf || !s->bitstream) return AVERROR(ENOMEM);