From patchwork Sat Apr 24 11:14:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27255 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:49c5:0:0:0:0:0 with SMTP id w188csp2035501yba; Sat, 24 Apr 2021 04:17:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+PqHEYojq5Vp1b2vP7ZNiIVZXTQjcI7eQr+7lSzFu35+KOQsrIw9d04k16CUe5gts86qQ X-Received: by 2002:a05:6402:51d0:: with SMTP id r16mr9732796edd.52.1619263030276; Sat, 24 Apr 2021 04:17:10 -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 cz6si8187520edb.335.2021.04.24.04.17.09; Sat, 24 Apr 2021 04:17:10 -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=mvsI8MIQ; 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 B2DF368A112; Sat, 24 Apr 2021 14:15:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075100.outbound.protection.outlook.com [40.92.75.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DDE268A094 for ; Sat, 24 Apr 2021 14:15:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PFn8gtkQbWOkUeRP/KmLZkcMyYmLWEdG21UPPBdzGqXl7UtLNO+C42dkJ+6YELaB0TEpbeYC0Mle2zDM3dp530t37G7T4GdvdswLMW1CckEb1TUDKzAtmsIeS0k3p6s7Ql3ZLgair/Lt1K0FcVwLlBpcTqjMJxgLS1UUyMHxXAowYH4Q1lAJkGW9qJsQNzpgdLUduEB1N+jBbZJTf4E5Q0hAiRyGmj7daVpOgR6kS6Nepgn75cG9a3Mtchl8ydkK3IluEbZZOBVenfS4XM96oaQFKUxKicwQwhnDpNotJLB1VYkL66YtWEoif6d2SD9HGFFAU7GX8G3pdRdcD2GC1Q== 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=yCq9B5PjOwVsIabWbK0tjXkw0r6EyARwBiuOlnitKic=; b=XpmTJxK4TQv80VwGsl6gAktJ39pJmOz7UNlsrX7QGkKKfCvGSZuFyZDlODFKdEE9EbvSzjZaULzKiHKCxA0YxP14fD2FEewFFvHabXw88xA8OaKgIX5WnzKBMXCGFZWF/SXT2+ZfILUcUu7Sk/0QPKGPn80JyOuZs1nZiQVH8/B0iR4GPYbbSpKZ+GTDD3PPpnJUL9caJluR8FLxjm+QtMoAHgjNRLHWxdbGkMLpZ68otSU1UtJLcIq89PJ6hbHJybpweQa76Mp7CmYaYac83U4Tkf1WtFDCPYpGQE38P6RPhGPex9yGTMV8HPpVVcm+Y1p6py0GzIfQBKFkHQ2Mlg== 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=yCq9B5PjOwVsIabWbK0tjXkw0r6EyARwBiuOlnitKic=; b=mvsI8MIQVM1E+qv8DXKILgyaAPTUo7Bz7rgS+mLVtxvLFztee/VTrpqPqXPpsVCTBdMzS9OnuGU1qAEfpIRbVrIDwTmIoSADOgVlERTr5eN9aj9C8mb86geaGy9+14dPC59tGm/RbHcu64s5wZiyzycgq3JEAQEGnpaVItDpdufFAMJzv80noT3Wvmx7YxhiayPrG2DrFNZcP9FO/MUZJSv5CWKG/nmATNq39kjI8d9rm7TjXv3utrTkqkrrMfE+o7zp5AyLCjqtu6iBTfpCCr/YKuuvepJchTlK4MDmBt5ZCRp8R7LFFqn+rDSEdNtO+5JbeP4alQOLm34UJ1JtQw== Received: from HE1EUR04FT042.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::49) by HE1EUR04HT024.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::99) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21; Sat, 24 Apr 2021 11:15:34 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::46) by HE1EUR04FT042.mail.protection.outlook.com (2a01:111:e400:7e0d::159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:34 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:E09D6766EDF0EB228B2F8A6DEFF9511C31E368007D6E4EC39F4F79A93C2A42CB; UpperCasedChecksum:02876727FED777F5B0BDB263B41612B6BCA3B5418EB3DFA1A43C60B8A850A457; SizeAsReceived:7583; 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.4065.025; Sat, 24 Apr 2021 11:15:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Apr 2021 13:14:40 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [xBLLLu4Cc5ItWt0bNN9c01U3K60GQYr+] X-ClientProxiedBy: ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210424111446.30338-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.248.86) by ZR0P278CA0160.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Sat, 24 Apr 2021 11:15:33 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8a3afc36-c135-463e-aba5-08d9071247a0 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUdbPdAvhx5/8x6B2xiI3vbbLLC1dOt+8o+uuXBXKQ418WOwZhLLT1cJ9zalL/QUh3D4fWpST5YLf3Etpy1mN5Yr08E0dwXRh07zZ5g6OpZfVUU9ckxxRGWmv/i4eJtWEyN/9/bYKFoHlGIU82+BuKIRTK0mX3glkwKeK8j3rTY90jXmq5KQmwQQj7+VVkvcnIH4pJJwVjFeeUH/q5p1bFxNIP+yL3x3FFIvyCmYefcJZdRPvEi+GmD6OUsFAu7F6XmYvHCQ0AqhZHkIvpcRpYU0ZBr1gh8AbeO1RCV63/mzmyI3obEHEWfD3BPtXTsAT2wKrCqpSJ5jxVEDeKxgpp80invVk7AEcxSrvXBFpjKRSb3iOv+5fxxBI0R7c9CKI0I3Z7OA5hcaDUOMmNct4jtggiCx4+w+OJzQqMrMTfaUFdjw83b7uCEb2+F5wma+ICcjf38uc6LsAwsemwXvxYrTh1aJumhtwqGWgFI7AgfO3ZQzMQqFxNTzW653zP+eCVWBqxydhnu/QIVCoQ1q5Tjmh0RFdC9Md9eTT9UPKDAU/oq/wx4ZYBY9Noa0htQHo1pjCUhmkczKSuQulHzrqH2XnzcuO6yWb5S9X/FaOb7uoNOPT1EiD3qgYsdQwBwQMmfuVctIFr9WnnEwabLWVfLGhYBmFFiv8Ms/10p/g0sxGNj33wd9NapUue0b1aBsSHyA2A2ufWzu3vu8lrP3teX3a3mTubqRkY= X-MS-TrafficTypeDiagnostic: HE1EUR04HT024: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yy3n7krGaiKFXeakeAqBLOcsyT3tNTZPR4uCdhNAlsz3993cD7aJCnRXAtr8THsIPtZCk4N2bIuVlF72ZkQBlo95ffWtS3AN9aMYBSqhEAPlar8O/7IqkoBtNIJ9IotI3dwUVcnt9t8tDqWHqy8PgRnNCxciiiT6036ejQgUUc5R9qH1kkG8HRGZv/mb6Wzg+VjV5Yb1GeXrafdv2zKO0WtoPR3ZNgtuyF4CmxkrnTcPllbyKLkku4JO4L7q3SgG9boacwRZZis5GwYpv0PQTrqUFxbOFqbizY6V0Ah6YAoXs6O1Rm7g1Q0ZNY7hYw0Z6YJYvfoE7seDQ3wrtz5dKeww0PeSPZWOWxqm0JST/8pDrON046k/myIekYJViecB/6gXdV85Ij+tyY3QuW8kFA== X-MS-Exchange-AntiSpam-MessageData: fcpqk+PMhrkT5g12BsRJJDqSxvNJyBGG3n/ehcXgArtoNv9agxVB6vMLmCQBXy+oFMVvxCTAot5JgE+vVkC16COeepIFeuf5m8dh3LoMxiA7ShyEjj3WA8opm8Ln/kDWehvGGHLsCJwxNOnolKc03g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a3afc36-c135-463e-aba5-08d9071247a0 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2021 11:15:34.3822 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT042.eop-eur04.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: HE1EUR04HT024 Subject: [FFmpeg-devel] [PATCH 08/14] avcodec/ffv1dec: Check allocations for 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: KaBduIPFBkgT Content-Length: 1686 Signed-off-by: Andreas Rheinhardt --- libavcodec/ffv1dec.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index 45bfe21be5..791dc073bf 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -259,9 +259,17 @@ static int decode_slice(AVCodecContext *c, void *arg) if (fssrc->ac) { pdst->state = av_malloc_array(CONTEXT_SIZE, psrc->context_count); + if (!pdst->state) { + ret = AVERROR(ENOMEM); + goto fail; + } memcpy(pdst->state, psrc->state, CONTEXT_SIZE * psrc->context_count); } else { pdst->vlc_state = av_malloc_array(sizeof(*pdst->vlc_state), psrc->context_count); + if (!pdst->vlc_state) { + ret = AVERROR(ENOMEM); + goto fail; + } memcpy(pdst->vlc_state, psrc->vlc_state, sizeof(*pdst->vlc_state) * psrc->context_count); } } @@ -343,6 +351,10 @@ static int decode_slice(AVCodecContext *c, void *arg) ff_thread_report_progress(&f->picture, si, 0); return 0; +fail: + fs->slice_damaged = 1; + ff_thread_report_progress(&f->picture, si, 0); + return ret; } static int read_quant_table(RangeCoder *c, int16_t *quant_table, int scale)