From patchwork Thu Nov 10 21:14:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1376 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1067259vsb; Thu, 10 Nov 2016 13:14:15 -0800 (PST) X-Received: by 10.194.96.164 with SMTP id dt4mr6283488wjb.28.1478812455253; Thu, 10 Nov 2016 13:14:15 -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 qm4si7125753wjc.221.2016.11.10.13.14.14; Thu, 10 Nov 2016 13:14:15 -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=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 9BDAA689E81; Thu, 10 Nov 2016 23:14:09 +0200 (EET) 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 9AA69689E3A for ; Thu, 10 Nov 2016 23:14:02 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id m203so3879757wma.3 for ; Thu, 10 Nov 2016 13:14:06 -0800 (PST) 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=1FYPXq0oTIb8ROLTCzYyFR7Ar7gJwuhgLSgMKHE1yWA=; b=i9unPmE7skw6mtRnnb5aAMa8l1iyD/SLHm2XMyNcZO1T+Xk0zd6eK21HsCEaHhXNpL 4ved3MVr917pV+DWeEqAQLdVZjoOIOIAKoDI0QLcggUukyb0boEvbnKrPIB3k8hDhXb/ LVuG3o1gviMGUK0bnSBF6qmGAKPnY3lcbole5//+ZQSS7QvEO48RcMbkFU8nJLKDG2fI zo3piUr0KIKvCllh1hLAvBar22SBiMewFCNqSdxgFeySTQm1mgDtOR3FL4DWqWtuo3zr nGX+Xd+aE/8iICzaBj0OYkY7WSn1xCdrjwqBhdL7B5yhL6rIThUpSfLZswCQ1Aw1lAr4 jiew== 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=1FYPXq0oTIb8ROLTCzYyFR7Ar7gJwuhgLSgMKHE1yWA=; b=RC89XrnddUAabbpSOeqt+m9LUOlF3GKU5a+7M1+t2YX27UW7HzeqfOP5yLQTetjumQ 4uGeQHC/76YKPhktdrklsOI/DNFeGN6ym0OuFfbWAnKJ4pb0KLUr2cI2TI4ULnntEaGo AsarSHapTW0grFTOqEDinIkSY+ltH5GhPXawdgT9jM7eXOZAQ56FBRSpC0P5DsN0UFin jEc2yBzprcoT0raFWRL9jQCGmv6EE6F9ASuplBxikXYzLqxpjhnWNo1kAWxSEIrfkc+k TJfiBjhVol3s8ODg0RrbdtPSc20A1iOt8aX6Rj88ESG4zQ+uacNA6tdS55+Be3nqNHhQ PEUQ== X-Gm-Message-State: ABUngveta7kbZkzJ7EXRCAI5uOpxewMcYEyO/NXtou4/hkMmuV5mMERLHzmbt8Vt5qC3BQ== X-Received: by 10.194.121.6 with SMTP id lg6mr7515575wjb.105.1478812445671; Thu, 10 Nov 2016 13:14:05 -0800 (PST) Received: from [192.168.2.21] (pD9E8ED50.dip0.t-ipconnect.de. [217.232.237.80]) by smtp.googlemail.com with ESMTPSA id k2sm7640693wjv.11.2016.11.10.13.14.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Nov 2016 13:14:05 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: Date: Thu, 10 Nov 2016 22:14:04 +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] smvjpegdec: make sure cur_frame is not negative 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 a heap-buffer-overflow detected by AddressSanitizer. Signed-off-by: Andreas Cadhalpun --- libavcodec/smvjpegdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 9057e86..e319e57 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -152,6 +152,10 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz cur_frame = avpkt->pts % s->frames_per_jpeg; + /* cur_frame is later used to calculate the buffer offset, so it mustn't be negative */ + if (cur_frame < 0) + cur_frame += s->frames_per_jpeg; + /* Are we at the start of a block? */ if (!cur_frame) { av_frame_unref(mjpeg_data);