From patchwork Wed Nov 4 00:06:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 23384 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 E6BBA44B5E4 for ; Wed, 4 Nov 2020 02:14:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CAAC568B7DF; Wed, 4 Nov 2020 02:14:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-1.mx.upcmail.net (vie01a-dmta-pe02-1.mx.upcmail.net [62.179.121.157]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A79F968B784 for ; Wed, 4 Nov 2020 02:14:01 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ka6L9-0002zR-0K for ffmpeg-devel@ffmpeg.org; Wed, 04 Nov 2020 01:07:51 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id a6KBkChSkIr7Ga6KBkM61o; Wed, 04 Nov 2020 01:06:51 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=QN4WuTDL c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=YHK8WkPhnBrZIQb5gRAA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 4 Nov 2020 01:06:44 +0100 Message-Id: <20201104000649.14740-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201104000649.14740-1-michael@niedermayer.cc> References: <20201104000649.14740-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAhkS3eJZGsaHyroLDSaILTUMV0dSV2P4ckQBL7S7CaSuTInQ89yAe+6+YeLAOI0RDBky+OAI6zWFgOWniZ9jBTABE0p3VX+P6b4oL3mPRCnWaM025ji Nh3egDoE6GkDeKxz/B9qlbezFQQVdP94miJXummU2/JRD33uvVPDYOK5 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/smvjpegdec: reorder setting output frame code 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes: assertion failure Fixes: 26813/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMVJPEG_fuzzer-5756269803339776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/smvjpegdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 973a9117f2..67f346650c 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -173,9 +173,6 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz return AVERROR_INVALIDDATA; } - /*use the last lot... */ - *data_size = s->mjpeg_data_size; - avctx->pix_fmt = s->avctx->pix_fmt; /* We shouldn't get here if frames_per_jpeg <= 0 because this was rejected @@ -186,6 +183,9 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz return ret; } + /*use the last lot... */ + *data_size = s->mjpeg_data_size; + if (*data_size) { s->picture[1]->extended_data = NULL; s->picture[1]->width = avctx->width;