From patchwork Tue Jul 9 20:18:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jai Luthra X-Patchwork-Id: 13878 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id F330E4483BB for ; Tue, 9 Jul 2019 23:19:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CF8F068AB3A; Tue, 9 Jul 2019 23:19:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E8B868AAC7 for ; Tue, 9 Jul 2019 23:19:25 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id b13so5236223pfo.1 for ; Tue, 09 Jul 2019 13:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jailuthra-in.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sftsPbELZV5s6+2TNcmbqeRi3UuWPxQIkraa7Sfox74=; b=UZYKG3QXXHzGLOTDk5+leHpQQk2xugW8CyF7B5u7c30WZC9LBSPlsy5ZnSugf7pczm 0LvQ4+ChwbE1VCczg2yyTu10jjDTm6MyY80sXAV593LhPreEC63wDcI8b4jAGdZwUND8 kPAW/M2+pDdZ3MgoiQcWLfPVUPdjJ33vryodpY+qhm1v1tXjebzxMxFLFY7YGWlX9oqa iau6zqM3nvencxdoNC+a+07ZvRJ8UWC2cJ8sENlp8GBbtPoWDZhRX3D9KlS7gL/rb7zR uFdnMZRa2vA0SDD/Qn43pNUi0z1r2V4zawU7f9NJtyRh8fhdVAQaG/CIXFHCe1enqgmr 4DYA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=sftsPbELZV5s6+2TNcmbqeRi3UuWPxQIkraa7Sfox74=; b=UnJi9HG6QIgWluNXlN5QpOPpUQgD5ut7VIGlOS/VZAU3pwrZI8dRcEK12xqzbVLEqK TUKxmjQKGvm3YApwcVe/pP7FVv6au3DCQ/3dWEqE5Sg3rXIPFtjjFidO7U2RyhCpSmEM kzwb7B4Jtcly/lM91fnxU7iSTiAQY+0enTJzHejeJw9aVrbtnd4O+TPVFFP9uHwM6GVe BjilzzOh2aE1TwQcZXlIHz4xmlO4szZ7OLw2Xr7s2qnxCddF5p+88kTHQYUo+JzTyfKm 38/82DVCsJJOqfW1HmZhTMhXQ3AAtrtw6v7jla47W2wb337cvp1Zd06kPBmoflpQ4f1N yqaQ== X-Gm-Message-State: APjAAAUzDjGmSP9FejWlztidEMAJlq6AQymE15ULupgkWsu/YMtpsjFK MHxUjXbLqBURCAY2CMYPumfBgoET X-Google-Smtp-Source: APXvYqw+emowi5miuTvu5cu+xaRy0t1UixVbFrIIlBrSFO/yJVCwCSIRLXG8kCjoDq2bntdcmQRb2w== X-Received: by 2002:a17:90a:c58e:: with SMTP id l14mr2142959pjt.104.1562703563411; Tue, 09 Jul 2019 13:19:23 -0700 (PDT) Received: from localhost.localdomain ([122.180.207.198]) by smtp.googlemail.com with ESMTPSA id b126sm26212575pfa.126.2019.07.09.13.19.22 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 09 Jul 2019 13:19:22 -0700 (PDT) From: Jai Luthra To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Jul 2019 01:48:59 +0530 Message-Id: <20190709201901.26693-3-me@jailuthra.in> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190709201901.26693-1-me@jailuthra.in> References: <20190709201901.26693-1-me@jailuthra.in> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] mlpenc: prevent negative lsb_bits lshift 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" Fixes Coverity CID 1396239. Signed-off-by: Jai Luthra --- libavcodec/mlpenc.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 1cee38c82f..41030f6f07 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -1,6 +1,7 @@ /** * MLP encoder * Copyright (c) 2008 Ramiro Polla + * Copyright (c) 2016-2019 Jai Luthra * * This file is part of FFmpeg. * @@ -1562,7 +1563,7 @@ static void no_codebook_bits_offset(MLPEncodeContext *ctx, BestOffset *bo) { DecodingParams *dp = ctx->cur_decoding_params; - int32_t unsign; + int32_t unsign = 0; int lsb_bits; min -= offset; @@ -1572,7 +1573,8 @@ static void no_codebook_bits_offset(MLPEncodeContext *ctx, lsb_bits += !!lsb_bits; - unsign = 1 << (lsb_bits - 1); + if (lsb_bits > 0) + unsign = 1 << (lsb_bits - 1); bo->offset = offset; bo->lsb_bits = lsb_bits; @@ -1591,7 +1593,7 @@ static void no_codebook_bits(MLPEncodeContext *ctx, { DecodingParams *dp = ctx->cur_decoding_params; int16_t offset; - int32_t unsign; + int32_t unsign = 0; uint32_t diff; int lsb_bits; @@ -1607,7 +1609,8 @@ static void no_codebook_bits(MLPEncodeContext *ctx, lsb_bits = number_sbits(diff) - 1; - unsign = 1 << (lsb_bits - 1); + if (lsb_bits > 0) + unsign = 1 << (lsb_bits - 1); /* If all samples are the same (lsb_bits == 0), offset must be * adjusted because of sign_shift. */