From patchwork Thu Apr 14 15:56:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35313 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp837285pzh; Thu, 14 Apr 2022 08:56:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhE4b4MEZs6pe7KsO+ylKjtEravY/goBZehEdPymdj//qC3eBlDXdnya573xs7tkvlwShG X-Received: by 2002:a05:6402:d0e:b0:413:3d99:f2d6 with SMTP id eb14-20020a0564020d0e00b004133d99f2d6mr3735548edb.189.1649951815622; Thu, 14 Apr 2022 08:56:55 -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 h18-20020a1709066d9200b006e7e6c83ea0si2093878ejt.157.2022.04.14.08.56.54; Thu, 14 Apr 2022 08:56:55 -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=@outlook.com header.s=selector1 header.b="b2/yVo36"; arc=fail (body hash mismatch); 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 23A1268B44A; Thu, 14 Apr 2022 18:56:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073030.outbound.protection.outlook.com [40.92.73.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AB16C68AF88 for ; Thu, 14 Apr 2022 18:56:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IwNrmWIJU0PvEkRrbDSGbpejXt/yu7cR9bQsh79timcZ9W4rnqtVkpEOHiXmNUQrZUROqrwfEqhF6ktKojNGUUb0LIJSU4Lfyif/nfhATk03ADeDlDWjYqvZDgw300on6XJyihdhN/SeeCxEGzlbCUTBioQ5dtKf/oSngwuC8NDb+Bo4ak3HqWyzcrUHtauAvHAQsayzH7aXAtXiMgQSUyB73nBivyjPB8nSAmG7xIbuznFU5Fm7PBrYtHtR2/DWUQq0FbFpzxDvFZZWmLeVgtV3MzxYKN6uySA9nCq8/70VKXASGySCdC6/MHuKJDlxSccG1npT8IdDkIoyyuvtCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=0HBinyXnRK8FpkFj9xBhzRohiBb7R7kUuFiEfS7TWW8=; b=lOPOlgp2wQhybKpn4R7uMe4ulSlx5dwbE3UgSywzcjMqPwxmFzQLpySDUUeUN07YJapFKwEgd+0mU0q0G85ZjrxTDUHRjnl5Li3m/IdzULdYZrsEGCQf3MiOLhKhL/oH2HqTNcoIn2c6U3qqhro0g1rMGS6D4+LkztQ4O7Ub89fEU36NoyKgp0TKbeyfFUFkNxXlWtILIgVI1NuYPQp5xzADdOumZ1VvY0KbHQpmJh8sEyNB2H/sV/ASjscwL/VtcTnrrlp4DFE1rgA9pnZNRWF5b/1ncb3kb13ml/2JLhiD/sRJGFCSBZJt5wq9/SRDBelh1dJJpitNNOrgKQpYGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0HBinyXnRK8FpkFj9xBhzRohiBb7R7kUuFiEfS7TWW8=; b=b2/yVo36Ywituf6JjCKGTFQQhA2uq/6VOxSC0mv7jWD+evFP9sErhz8RJxUdim7QshKGZuJQk4arHL85fKXopSlqRnZ8jIKkQ+xCOMj1XzhAVjv+2e7F45O6EC0Ds1lYHVtW8tEakt4WppH+URQesx1HedLP6NBPv+f2bKB4Ee5qiH5FDJqJq6SVGke/Zxav4FBgIPXaj9ZMgFKsV+5S8DW73o+MN0AE/K/0wO7NS72RWpBWWaKIYx7TcvTrAsZpR1jHu1pdtG+iHGuPt+SoqdEGLndacS0kL3HVm3yIupfaRCDbvAlCAujb/KggJ5Wb74f/nUsNV4IBB0WPiRbpuQ== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by DB9PR01MB9029.eurprd01.prod.exchangelabs.com (2603:10a6:10:36b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.29; Thu, 14 Apr 2022 15:56:41 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::fcc3:1285:374c:9b2%5]) with mapi id 15.20.5164.020; Thu, 14 Apr 2022 15:56:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Apr 2022 17:56:30 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [P7YQB8Zmxv/UPqXprtiYJZVIaS4CMK2g] X-ClientProxiedBy: AS9PR04CA0114.eurprd04.prod.outlook.com (2603:10a6:20b:531::19) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220414155634.1362545-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdc42b59-dff5-43cf-360e-08da1e2f5dce X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRC6LfFJetu3uBCNNIpQ3yI8S0aTQoZZGyPOl5om1z6kn4SwtVTyWy3b7eNdmlBbgAfkc4PxxP5mtS6Tj+sFn7YWFGqELIEq/LJEvAnAMxNhrfkkRLAQsoEStO8t4gEqetumv5Mjll3KhAyC4RudrsTJQOAlQRPLFNpE58cNSSdBBd+nISt8WBjKE+m/JqRQHE6SPHvGb0E0U69/ltyC8F/mD40uRkr8tVDSqcZRY7IKN4+fNhEFAcDQm8EqrO8CuJzLQ18U174aZUJouA3iVn7dqnsL3W6DKxTmsjt4bM9qZ3nZZFD6YUKH4oLWo6fEShoVU9PNImXh0kG4Mq5UBEyZwuZfpON7E+K9DqLx56v6QOBYSzpnwAaMaeBmnz6JK87qZMaZn5bx0DSdzEsoX81yCQsnsXICRTMWqC72HzCuUlJUM7lxrKe7ghS0WrJ4oOue7zwmQbkooLuTgv0xlQTtWJrODDbx1Z3az7KGzQsPd8wMam3qexmctnYx22RnEBe+1X4+nVcHSMYvFNj2ELgm8/sigcKFUZPM/kRe4dKutCme3iA7XhstqKMT0S8/xysPj8OnF2G87r16nQ6Y430NIoiz+TWv/3VF+zl5mK8Wet6lSmQjXAmYIFp0cXIfFhvsC0LJRBbPS2f3PfIhrvsD//qSEb0YdyJkEFYWu9MHJ4cC2Kl9E7rK+PjcVyrN3+p/mG7nH3wCP8t3p6ymc5obFhfkU4RJ2dhduGNYITfn0oeQ5haAZTzf5kM58/0zkE= X-MS-TrafficTypeDiagnostic: DB9PR01MB9029:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aHLkpeqxWaSO7tDfbQs4RzoY0jWrrFpUYOGBVwRtgZehMOPZRzwajZEjuby3Y06kGYXG/RjFlx1Yw3az7JDORtyURle1G7FTZC3wIjM0NVOyRMV9Uf/BEYfqCcw8S5xrqIB/CpqBZabhzXlULi7e3slpYMMygS+9jtFukKt6NRKJyeA5ZkK1/bk7l8sGkG7130vePpKlsRHuv6/xBRwutMiqCpU+HWOu1U7vQN/ZN5X3S08aVDjknBukpNAOoL+0UD2IHr/4eZ4/PGNWu6mqzPp1SQICrDe2kCx4xABMoEeX3V0iqSERNFj8RMmzLdgxUaafpOv8lYIxLKmk4LDnxFjvw2I0tD1xAVGMaV5JKujcR/Vi6CrfL0LIq91r1HfVOW56f+wAjejeAJEbWH0ixO9FD53d50V7oFznJZfbZFymNxilfAgGZ9ewu3YB0STSEnC6PtRTAekFOuPZf57evJbV2Fl6LA2kPCjSYTcPPlz1YfPM8GOHZULo0uUigd/Ta6xn+SKYZso2F8L4sYgPC2unwhj0Z+OiLEpIn6+zc/EO8YxAbFiy/TAGFOybabrzdVQdW8UVoZXjxfZidDtTJw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9UJGG5eKsl7vVTvCOZEx1l0+Bpj+3MmgIGovw1HwGjBQADqSGFmhXoWc3KgDget9Ms5ovtiZWgayjv5gT2vYGAzuBnnJ5inKPaSJ73I2WQCVq7KNS48OhKVYTpAK+dhqC/AJUt8vJeb/2BW5Bu7VzrYBNszumGdMKHhNijUsZuAhYQdvFsjzhobkGvgUEwFWbWZxmrrXndLUOXlf8f02Vt/cNnlJDuDSbg+WVZ2I3H2imxSCL8zJ/viOdW+8dbs4v+oeST4BSPYWOuzo1cROxegyvWk8tVTpWbxxC2ptbZLP2e6X34Jd0iMxV0Jlcb0sjka6+Q+IGlM4VBAwKdE3YW55/uZ5P5xZKofHtWO9iHhT87Vdz1Oq6Ql76GLCpPcYP7pHOJ1Z4d0Jcc/Ihkn4Er+l0kBgF7ytdwu6KZ6x+5J82v6MKKU6ZVmd1OOUQcnZaavrjL7qrChmEoQgAJqB/RnN/TcCOvfTwThDkLm1p9ZPN41dMGawu0Wp0h/Cy7JT9KVqbXHPu6YhVAyFNa/Cy5gV/TgSwgRBCYjlazvdD4aFLi9rV/JqoVa0b5XuQ8WkcIZo0S6RzOU1wffL80LrLCaQUgCSwAnrnvQNlQLzzUQC+tybvzF7yXKn9xWBp6Bt3t+ahmV3hfo2k+yEwMQH5PZgj6M/6+LMMCq3GuOKkik0b6Xjxbybmx03IMceo9EgS7vR7GA+pyMZpO4//9IGT2Tze+FU7SEGGUSC8ehmlb1WqiUG0RmN9ciBwjwZYN2ycVDUGed+/E8iph367VtzCVfrwmI/y/DQ0BNzDtUe9gDsdVGsoHflSk+vAlnaWcymd/3umwEug48ymC3IZ1Lfme0fTwbmc7HxwpK5763xuWY/UjExXr3wSuhcKdIebWFnWve+jS7swtFwOl/gemJmVJNfaRm+wzmhf642rQXSYELwgBeyrR9/7h8FLAcDRyQEiG8mWQ+rl3VOcQHTby4O7RK0AB1YXwxMUt7LD10VedY3Q8ZAnVee00h22O28xP9Ff2T0SnbmZowUZnwl3Z/AaFE1UJnQgy4m7nPxbYYOgA4MOttZr+gljDOO56znueapXmYwP2oLWtIBg5JkjpWEAGpBgO8tuywdHFAnvsRRN3zKtgyCwVNb+iWBaG6NXY3eYxEVpsmDeWO6VamEsWQR0cnI2/E/ZQ1rFwJq16KE3WlojKDWno5cb7QzSxCZWxlJu915xOkmubIPFSlcBckGXBtedX4yG1uKxHGYFIMpOBX3IsM9VLBQ6S2RyjXeZaFHFS1G9NaLMwGoqPxMFUS1/qwKkdXTQll/jv5UUfpsbCfPIWitLK2fx3NCJeAT2oo7MbWn4a2NpnMHLhSnsTS/Lr7jd/XHRGr52ap269v5kBRCRVPb1Feg9ShVeuw8jKsXNEi47BOKcX0ec998csTjFQVME1BYhnGaQmEwEeGANROk1DFSm/TJ7TUEwvVJxlJf X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdc42b59-dff5-43cf-360e-08da1e2f5dce X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 15:56:41.6803 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR01MB9029 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/mjpegdec: Always reset got_picture at the beginnig of decoding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SAaLiVnR5Pwk Said field is set when parsing a SOF; yet a picture is only allocated if skip_frame is != AVDISCARD_ALL. This leads to a crash in the following case: If a jpeg is split into two parts, the first containing everything before the scans including the SOF and the second part containing the rest, and the first part is sent to the decoder with skip_frame set to AVDISCARD_ALL, got_picture is set, yet no picture is allocated. If the next part is sent with skip_frame set to AVDISCARD_NONE, the code presumes that a picture has been allocated, although it hasn't leading to segfaults. Fix this by resetting got_picture at the beginning of decoding. Signed-off-by: Andreas Rheinhardt --- This patch presumes that there is not use-case for partitioning the data corresponding to a single AVFrame accross multiple packets. I am not certain whether this is actually true, in particular wrt interlaced input where it might be common to put the data for one field into one packet. Anyway, no such use is covered by FATE. libavcodec/mjpegdec.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 32874a5a19..0e76bf4c26 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2419,6 +2419,7 @@ int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame) av_dict_free(&s->exif_metadata); av_freep(&s->stereo3d); s->adobe_transform = -1; + s->got_picture = 0; if (s->iccnum != 0) reset_icc_profile(s); @@ -2578,7 +2579,6 @@ eoi_parser: break; } if (avctx->skip_frame == AVDISCARD_ALL) { - s->got_picture = 0; ret = AVERROR(EAGAIN); goto the_end_no_picture; } @@ -2651,7 +2651,6 @@ skip: av_log(avctx, AV_LOG_FATAL, "No JPEG data found in image\n"); return AVERROR_INVALIDDATA; fail: - s->got_picture = 0; return ret; the_end: @@ -2987,10 +2986,9 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx) return 0; } -static void decode_flush(AVCodecContext *avctx) +static void smv_decode_flush(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; - s->got_picture = 0; s->smv_next_frame = 0; av_frame_unref(s->smv_frame); @@ -3021,7 +3019,6 @@ const FFCodec ff_mjpeg_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), - .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, .p.priv_class = &mjpegdec_class, @@ -3049,7 +3046,6 @@ const FFCodec ff_thp_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), - .flush = decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .p.max_lowres = 3, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP | @@ -3067,7 +3063,7 @@ const FFCodec ff_smvjpeg_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(ff_mjpeg_receive_frame), - .flush = decode_flush, + .flush = smv_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_INIT_CLEANUP,