From patchwork Sun Jan 1 22:18:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 2014 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp3739923vsb; Sun, 1 Jan 2017 14:27:04 -0800 (PST) X-Received: by 10.28.55.73 with SMTP id e70mr39076769wma.99.1483309624902; Sun, 01 Jan 2017 14:27:04 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v134si67252089wmf.32.2017.01.01.14.27.04; Sun, 01 Jan 2017 14:27:04 -0800 (PST) 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=QUARANTINE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B30E9689B45; Mon, 2 Jan 2017 00:26:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wj0-f194.google.com (mail-wj0-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD629689B1C for ; Mon, 2 Jan 2017 00:26:52 +0200 (EET) Received: by mail-wj0-f194.google.com with SMTP id qs7so29184848wjc.1 for ; Sun, 01 Jan 2017 14:26:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=4IO42N815cFpopdimLSlD5wR+rOC2a3RDDSK14VcGYg=; b=kTDpx0GaZOBdnPf3YprtVlvCUMLfLLUTDZ7z71Gt4bErxOH4Vuzjnrk6OMzSJteLxv EN7mWXgpz+Dr3P+9ShZd+qPtrnf98rBhOfLV+P7a5uVCjDq/NF152H5xiIE0SSetpj08 2+0XkKczuAvFBL81YavThSZA+ZXDXTO5g60jqaxpw2CxUVYX9mve2Gpqtpj80++RHd/t eWsobe5HNQO/th+r7f7YTRDAnucmwcmutY53QML5kYbJAC6NIUtMqSeEqtFYQRPjwmSy fs1GOXWT/XXAGF+KjpimuZWKpzeWMZc3C0nLrrRZY5wSXx/wfhiB2DTH9XrHTJnSRFVW kFvQ== 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:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=4IO42N815cFpopdimLSlD5wR+rOC2a3RDDSK14VcGYg=; b=r0W4/YXphrJuCRmvUSlHZ18Ne6PIqCmYJqwXQ6mkyinxijd9goK+Sgzxtt+46ZrpbJ IJ2Re1FWnh8cLLL1aQi6R3AlR/0sTECQIOLV0dZbbZ1e6XOC5XasgHG4v791T4gQqopS EqTTgY8ElIqUPZzPaDOeO7Rqi0Fm3uQIK00JXDQTwooR/Jx6dHUkfRGtwhQ3W1oHt0YP YipFKGqOa5WiLjV89BKW+9ZetgWRs/GTKhuyG7kNGBl0luXhZBWS0ylAkXUyv7tTe1kH Y51sYh593ZGH7cJ4Scu88nLvX535N139W/tFcvq9a2BiIOKqvnEgzWZdqAMZqN+tQTCQ bEcQ== X-Gm-Message-State: AIkVDXIcdnQiuHrLl9YvnMftX4AU10c4U20Jo/wduel4g4cjeOljGbOjtgG3LaaIOTrYbQ== X-Received: by 10.194.52.42 with SMTP id q10mr46035778wjo.50.1483309130806; Sun, 01 Jan 2017 14:18:50 -0800 (PST) Received: from [192.168.2.21] (pD9E8F88B.dip0.t-ipconnect.de. [217.232.248.139]) by smtp.googlemail.com with ESMTPSA id d184sm81972167wmd.8.2017.01.01.14.18.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Jan 2017 14:18:50 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches , "Ronald S. Bultje" Message-ID: Date: Sun, 1 Jan 2017 23:18:49 +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 1/2] wmavoice: truncate spillover_nbits if too large 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 triggering the av_assert0(ret <= tmp.size). The problem was reintroduced by commit 7b27dd5c16de785297ce4de4b88afa0b6685f61d and originally fixed by 2a4700a4f03280fa8ba4fc0f8a9987bb550f0d1e. Signed-off-by: Andreas Cadhalpun --- libavcodec/wmavoice.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index cd5958c7bc..1bfad46b2e 100644 --- a/libavcodec/wmavoice.c +++ b/libavcodec/wmavoice.c @@ -1923,6 +1923,11 @@ static int wmavoice_decode_packet(AVCodecContext *ctx, void *data, * continuing to parse new superframes in the current packet. */ if (s->sframe_cache_size > 0) { int cnt = get_bits_count(gb); + if (cnt + s->spillover_nbits > avpkt->size * 8) { + av_log(ctx, AV_LOG_WARNING, "Number of spillover bits %d larger than remaining packet size %d, truncating.\n", + s->spillover_nbits, avpkt->size * 8 - cnt); + s->spillover_nbits = avpkt->size * 8 - cnt; + } copy_bits(&s->pb, avpkt->data, size, gb, s->spillover_nbits); flush_put_bits(&s->pb); s->sframe_cache_size += s->spillover_nbits;