From patchwork Mon Apr 19 02:06:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26982 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp684887yba; Sun, 18 Apr 2021 19:07:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrCFL1BNW9LAPjqLYxlC/UgwepZqnufMFlkcd1K6/MhQCewkM/Tp0gfrDf93bMDwNtgSz2 X-Received: by 2002:aa7:cc98:: with SMTP id p24mr22807144edt.187.1618798039988; Sun, 18 Apr 2021 19:07:19 -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 bc26si11257207edb.270.2021.04.18.19.07.19; Sun, 18 Apr 2021 19:07:19 -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=RyoCbcza; 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 0F4ED680BF9; Mon, 19 Apr 2021 05:06:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069040.outbound.protection.outlook.com [40.92.69.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98091680AF3 for ; Mon, 19 Apr 2021 05:06:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hd3XQTNnenYJwIZR3gn/romiotOWgJQlmyQRe4FrA0Bqax3i0gVRw2ftFdjlzRCgGu4t+Q/V9gor79jMYYVKnX02E7CduAHimnNFzq+6y3jTEROEUubelrDXPgg//hSiLx4ntOnawlhCjdr4bHLvQkOSxsp0TPXU4Dvbwz8EgA6A0QeNuhryR8j4XkULa9ZENdT/nFU3JJBrDKf0qfxgdd103FLqfrIFFnqODgZICBTJzEFsTVK6P2B3xtuv4aC+TTnol51XCKRaL3bBKOCa6Gc7BsewYi5eLNiWWlvz2CExrCrMECXxM3KwkTup9+E7JCVTyQSdzl9CrPQGWZXAfQ== 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-SenderADCheck; bh=puy6Tjl/8475uE5KZeiUi6CwtboirzPu0gsCZ7y9O6U=; b=b/Jneq8Ew1BfhQiDzLoPT8wfvjxYSkTLJT4P/n+exF3ThAu0BCotUxQjcY8dvxTVPLz+UQPTGt0RJoSpoKDF9LLS/gzXcbSF0jw0N6ZAkXL/6yDaepuS8iEQvSlKb3ZzK1FsSTr/z/0m1sSflYHKE+YxhRjcQYlkbwqeZZ7ohGqpdaSSyW+/WXQJc+1tDhpISJnIdWZ0vMuhKG14H8acIVLbr+eX3+mvbjcjI9Yn5s3IeXShYqg32GLaZMZTDpVw5tIdN5ty6JgW4u1qlsaZtmX5QTXEW3EyOO93R3to8owv68N41wNky9XhbSm6D8vvb0tajJOdYZAlOSqf22C8TA== 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=puy6Tjl/8475uE5KZeiUi6CwtboirzPu0gsCZ7y9O6U=; b=RyoCbczafD7O4NNl+xEHxbrzEH3yUBLyteLk1u4exfkopTuSXnusduciF+hAJvgb0WxjuWAijBPuiqRR6QfZQs1TXQQXrDmY5f51SfyoEPcMpqcCPox2HbMSu4ecI4wwsKFHnNXuwVzUd2XhxPRjZcVmLiEtdwClfWfbRK6HUUdSDfS8INbfbRyKghgCK+A3YflGKtVlm093GkpHcLTUIx1xzP6ODGurD2lM0pkQJTK1+lRhbWr0/p7b4cg++Qk617THtu25Z0J4ER2yV5V8s5l/lQ2uASputIrmkhBMc90A/Yte0jCSa4wVLpYne7B4Vw5jszM5566LCEtoQ7HXxA== Received: from HE1EUR02FT005.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::47) by HE1EUR02HT222.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1d::306) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Mon, 19 Apr 2021 02:06:35 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1d::41) by HE1EUR02FT005.mail.protection.outlook.com (2a01:111:e400:7e1d::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Mon, 19 Apr 2021 02:06:35 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:09AD3525C3BE9B8EA478DDC38395AFAEAAE23A603708227AA303D50DC7DEE6AC; UpperCasedChecksum:38ABAFDDC11362F0077E97D5717444DD8C79C6A550477A085A70C1F9A5DA115E; SizeAsReceived:7602; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.024; Mon, 19 Apr 2021 02:06:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 04:06:14 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [vM0q5m/fPiNFSOtKj2T4FKEOkGKiLjWr] X-ClientProxiedBy: AM4PR0501CA0051.eurprd05.prod.outlook.com (2603:10a6:200:68::19) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210419020614.92961-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0051.eurprd05.prod.outlook.com (2603:10a6:200:68::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.19 via Frontend Transport; Mon, 19 Apr 2021 02:06:34 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 52139361-2349-49b1-9a0a-08d902d7c253 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UL5of3Fna0zoENiR+FBTuR3DsHAaInVGIEJF3pgl6UJynihVs/GMaOFXD/ppUMqvyx15xzng0gclHu2xrEDMUfMwSsJ3dcnMZftRtxVkKOu7zAFgSVSyXr7H2vlJKEUGtl2yo6L3OlTvat/2N8mQp5MR24dzUDj5Ccn3ngo1QJCGgFTyeJJ3ycM+2TGsCwemhiue3qklLPxgtk10Uqrwmn6ztxu/JkdCwQgks97xtUbqiBGFOOPLJoClvSm48z+JOMA0iibfSvqd7s8hsEpoVhkqeWLbjVbr3X58GjzzYfOaZsjiboK+4tA8mOjKgp9P4oYHj7x6LdT4F9rrQgTGyo516AOjv2+6Fup1TS1QSzBJtXkvqvHyUaRyzGmIMyiirxigbaTeq0xObjlvQ77/twUIO03ltnkkRVP+rzsgWwLcAXuflttlRNvXs1JqW5/yPoJyOsrH/h6P7XwQNRirPAiJoIDjdk4It7bJ0AJZK7J90mFkaS2EmtYAwR82KHEF7jZjM/ymNxSWqQsi5fiOeRMqdE84tQNvuEw6vCqN/umwhHKNHWokSrSrsABNdHTIHz3YYLOPHcVGhklBiNcs8bE5RxVa53se0viBBCzAM96Zmhy/zEpo+x/Ty4u8qNmtsINFPJnfNmSVCq0bF3t2GBCCabEHDGExh9m4jh7vp4Wpho8DhYwA9kT1+2MBYQxGEBuBfw4oQIDqA== X-MS-TrafficTypeDiagnostic: HE1EUR02HT222: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5TmywZQrJZMsvZwpfBsvEn4cR2Viyo/PUGUt3/b13rEwFqj596Zp75E1LZFzh4uPbiktNNYmWlnFV6BbmYT/P77/Hbrdg0P1YUlGWJFzl/ZzczHnNb+98Ah05WhyeFtwwiK+IiCFzK3udPkLB9LIyPA7OqzjuUJpq5BpY8k6kj6JwLyQQZL+6kCVrRpngDa5/IPMgpkKeAwI1RXWfNGOxGdaS60SqLclMDkrBKj3nIg5jff4esKgPRPlxsQ8xCJEVtktlMMNkFNaqvZD30OzUpZk8Wsctl+Kakrj/XlLpzZg0fR/6b50dV7Wre/T6LsmdUdcBPVKYbzvXGz4Ip2yKHDiwDpQGLndo5UxubKRIM6eEwC+r/J486AaADC/dE0DGMtpKEk5YQvXMbwBeQvr7Q== X-MS-Exchange-AntiSpam-MessageData: GjRcuxXUM00acbHZDJz2YlqphDWYHzL3GboEHltgvVNGp3LSQEDiwS9q4nfNKPkYqLfLq155noutRfK2P+F9hftE/UlcoUMEabeijKdJKK/gObj2UAf+5ABRnPjlN0b3DpHW0P2OBl7BKOR0brr/Xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52139361-2349-49b1-9a0a-08d902d7c253 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2021 02:06:35.3237 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR02FT005.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR02HT222 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/exr: Return correct error code on allocation failure 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: /IigZtaKtT+U Content-Length: 883 Signed-off-by: Andreas Rheinhardt --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 49c4774145..4f55609b0c 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -2245,7 +2245,7 @@ static av_cold int decode_init(AVCodecContext *avctx) // allocate thread data, used for non EXR_RAW compression types s->thread_data = av_mallocz_array(avctx->thread_count, sizeof(EXRThreadData)); if (!s->thread_data) - return AVERROR_INVALIDDATA; + return AVERROR(ENOMEM); return 0; }