From patchwork Sun Oct 23 16:31:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1151 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1838502vsd; Sun, 23 Oct 2016 09:31:54 -0700 (PDT) X-Received: by 10.28.166.214 with SMTP id p205mr10742001wme.24.1477240314056; Sun, 23 Oct 2016 09:31:54 -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 x126si8102041wmx.10.2016.10.23.09.31.53; Sun, 23 Oct 2016 09:31:54 -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 B3041689D0E; Sun, 23 Oct 2016 19:31:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13861689CE9 for ; Sun, 23 Oct 2016 19:31:43 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id o81so6279752wma.2 for ; Sun, 23 Oct 2016 09:31:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:subject:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=u/KT4s8eBCctd3Z3vwbW/8vFjPFSjH0y9hAwSMnHyiw=; b=zuz0TK/UiY74sAeAnt5DkYo+ElZjMK3HYSqcsTraPQ5v1EJH2qz1Nj7vcTPxu5HnFX qX/hdfdXOd5/le/TvwLHsNX4k8uU0JQrA47ps2Xh26aheGuREEmae2dum73paLeOipD3 B2EEYYu0w7NXzZldAQuKbzrkVI77acwBnP/NaZBX/4D2aLoPehyv/omBSp+hzlwNHxqT I5I75WhfrAUr2cC4tm28w5GzmY7uV3NCmzR7mcojkv2e5jIlelY0Ycizz38WEbNM6uzr crYOvBRYwVRBmMEIOJLGkg1cbFvZfXTfjtn2bc6ItEX4UAR7mrvOqXqnM/kzxk1B8wLU C6SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=u/KT4s8eBCctd3Z3vwbW/8vFjPFSjH0y9hAwSMnHyiw=; b=EBTY5NjdFtGNnMv/xUE5fFg+NbTYQKQQIdtm+exexDnkJtAgoVHosVhyS8ir0BYpSL q5TY0jEeaAO4ZBBfvSCV31kG7HQprGGbADAAeNmcrSovHKK7KmZZWIc9pP9M+Tj1mIZF UIMvd47mBC0/vhXyZNMmZ62zopxqtOlSfQArBbkz3hNCGBNZXfORp/hQtpl6KSqQn8Cj rLNufHfHzk/MetIBkpGYaXjQequH38+xCIk65ihyncmsdFonU9a5efxB5eNTQQFxqspv 0rEwyFW+OE4CnGbXRmnzW2WVqTvSsno2tyOmZw0cuLaPXmB0OszoPfmFoS4im/QzCTAQ LfYg== X-Gm-Message-State: ABUngvfZHPNGDyEAMI5+4QqYoNJlbhagqntf1cUy/afrNp29Nj891kEGDlbDIpIPib5zyQ== X-Received: by 10.28.74.193 with SMTP id n62mr10883074wmi.67.1477240305735; Sun, 23 Oct 2016 09:31:45 -0700 (PDT) Received: from [192.168.2.21] (p5B095E5A.dip0.t-ipconnect.de. [91.9.94.90]) by smtp.googlemail.com with ESMTPSA id b8sm14529629wjq.40.2016.10.23.09.31.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Oct 2016 09:31:45 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches References: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Message-ID: <239012e1-7554-cec9-991a-9e5f77250bed@googlemail.com> Date: Sun, 23 Oct 2016 18:31:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <6622a3c7-3900-8982-1179-4ccdd0fec2b3@googlemail.com> Subject: [FFmpeg-devel] [PATCH 12/12] xmv: validate sample_rate 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" AVCodecParameters.sample_rate is a signed integer, so XMVAudioPacket.sample_rate should be, too. A negative sample rate doesn't make sense and triggers assertions in av_rescale_rnd. Signed-off-by: Andreas Cadhalpun --- libavformat/xmv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/xmv.c b/libavformat/xmv.c index b85d0cc..b974e5a 100644 --- a/libavformat/xmv.c +++ b/libavformat/xmv.c @@ -77,7 +77,7 @@ typedef struct XMVAudioPacket { /* Stream format properties. */ uint16_t compression; ///< The type of compression. uint16_t channels; ///< Number of channels. - uint32_t sample_rate; ///< Sampling rate. + int32_t sample_rate; ///< Sampling rate. uint16_t bits_per_sample; ///< Bits per compressed sample. uint32_t bit_rate; ///< Bits of compressed data per second. uint16_t flags; ///< Flags @@ -210,7 +210,7 @@ static int xmv_read_header(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Unsupported 5.1 ADPCM audio stream " "(0x%04X)\n", packet->flags); - if (!packet->channels || !packet->sample_rate || + if (!packet->channels || packet->sample_rate <= 0 || packet->channels >= UINT16_MAX / XMV_BLOCK_ALIGN_SIZE) { av_log(s, AV_LOG_ERROR, "Invalid parameters for audio track %"PRIu16".\n", audio_track);