From patchwork Sat Dec 11 18:40:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32294 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3357293iog; Sat, 11 Dec 2021 10:41:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJwH+F/i/XBkqpBuQ/h9YIjCIaZUjpr1iyqAKR5LaCtL1FPB+sVH6sFnNbgszfRUgXj2V7N2 X-Received: by 2002:a05:6402:42d5:: with SMTP id i21mr49028049edc.373.1639248073076; Sat, 11 Dec 2021 10:41:13 -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 a5si9050052edy.585.2021.12.11.10.41.12; Sat, 11 Dec 2021 10:41:13 -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=@outlook.com header.s=selector1 header.b=iwuFj8Wf; 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 B0B2568AF34; Sat, 11 Dec 2021 20:40:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9F29689BFF for ; Sat, 11 Dec 2021 20:40:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UgzPJFu3zPchhF2BRFOYYKUD7VhhnTcDJ+Nvb3nixGhowItIVKxVaVYrVTdP9jrt7RRZkYOEU3dYQIi6gdxT9ogyGaEv8v2qQkv7+lcs9BZXNFKgRLKp3m3XOekR2QAKdTeA8cEj2ySDxtA5RaHpIdUQ2gyAa28kgB4pSyzXqC0tpFkDkrQcPCs0Pt3uuotieiGvhoQ57/pBUpkHaFhElxoiSJ43uJzE1V1R+xSi9Bfy0eDQXI0JPS6lJwJl1B0Lo20lwG3MIdGgcKhrSiYs6Q+k0S1JeEDdRWG3ZGCqiGgx1mIDdTZFV0cCkIb946Kh5IiFCauTdjJECAlH7ECVLA== 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=KUUmuyE+zZfn5+SFM8NR02pMt1JDePBzcmkGnH1ikCs=; b=MhGgEP7fofBkN0NCmL7cPLosYTenxHpWZlZkc8QJlrBg2d2xH+KAr4iUsK8zeZJWC5L3SyH/mjXaJtETWcbXhRvRYAvq8oUO2gZf22A0Dzfw+cXmls2f/LXLhcULJY4VQ4ftVvOvglg7EX8T18TAKdwR/4x0Z2EvDA4l+E7C1Gh4Nykk4J9MkPbwIalKJ5t3TMv8Lrf5889z1KeIZR9jzbS2Lu+Z/4bEgrFPWqcwI1P9g2pfUgSuR8dHP0D6bOZVvbc9IkpQbhD57MCC4nlnUI5iaRUO+iXMx07dPuH+1Tms1qfnywtYca4wC6hoNfW4lHdReOlhWsBUyIn4R6DDrw== 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=KUUmuyE+zZfn5+SFM8NR02pMt1JDePBzcmkGnH1ikCs=; b=iwuFj8WfmofFWp3dJTdH9xZLzKg/EgYPV8FNuOfqY5LFmuLUMrsW0pyAnWWrV+5tykAuzIt78hYkrgOoEHd91MtkBBNBWeG6QJYCJM8usiMb590GF/QAll1o50b5GSf1Jx326abWzfBNZqedkAj8wjZcbqYCiOypqWcb9ZQNPzwe2a/dZcH/JcElfjBmaGRI8TVLXj7GS3Ej77YLvOEJLnrjLtHFOGMHHnTH9qlnw1gbnhKz24cDIX+RRP0UUyHNNrqYOOmXVhb77aPd3QXLQyuml4UKOqBrRq/Nb55OW4R/i7T0axEu67UvMHoeN/r+MgunObIf9ffK+o/42cfG9A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.22; Sat, 11 Dec 2021 18:40:41 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sat, 11 Dec 2021 18:40:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 19:40:18 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [PIZJKQnurXJ9+uty/ZjefQMyuXEEUuAz] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211211184025.1430779-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01384dd8-adcd-4900-b4c6-08d9bcd5bbf4 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrGqEGMDh6H/uT78iMSw3HXMTjUydiD8NjtfqMVUVy7a+fRw6lwORgX1skiQYyTS+/is8wUWwTr+DtxWwZCTpCxlwBEqYTbJoCEjH3XSInMhloVkAo1IiPPhQM/A9exx0aV9ZJ3AdzGS/T9nRR25D7I2veXqYa7aJiw/9xROp2ocu4Ui3SRDdTBgoW+NIo4NZxHGQzwuLFxD5nk4xlM7Fl88xiFH8VhmH3qYlgQbUSDm9qZTzrV+o3ZUSgqeXxJ10sEGVlxR4wWbxq4xx6uUNVWy/RRFaW5BfGPh1scD5ElHsBdupjCqDatgRfgAqCJR8uL2gRAmVKw485TMcXU9ME6Gi2Puld9VI8P8bHtkKfB3OaM7oBPOEa8Gu2JmIeL4KywSj6omKP8Z7jFRpoqyHKsjv8v2v8+tgK2Du+dKC8WTizy9BMo5sWJlQPKYXtMvzHZPgzJmUQzViRst7ISRLqGIoM6C6ZULiMzUvJHs0PCWzLmXatumVKaYptVoEkqUKvG7xxr9Yuzu4acmPIyHq4LJSFz+ThpYD9kJ2wTy151g4IYgcEazlUKudU3pSjTeLPE1b2fdbsBcxzgZU9aZJOAPFZ4yzozUIoYf/0jQb9XqsLCfIsm3gCIMQSVwu2JHs/l91+OxRchYNaBEDKB0wvl4fElRvDs81LpD2Pp8RFgq6p7Tpz9eZ89e1RSmA0ECmJ03f4XsM/jFVoc8blBIDseI= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OMpTJDOULM+Jgh800b/GB1SqwkncfvgwMm7oN1tbvccJW8/8jlsr963svT4YaC5+rEnzgVilH1i3jwIZhxPpVKbDiXGd5N4bgGk9yakqf5VEq2eHVYRV0bZk7pttYjhVd6Gz+ildP9NXORsyw/1NwnpAl/RETizHTiWKJFeDMjZ6BIpqkYfnVBPsMYwfzhjLqLYeZIzEWbqUPIqmmPx08jBWuuzEW0HgsRVCeoISclCJ1q4GKs/Fq8tM+bEmI3vs9ao4akvIE6i93XeBppaBHGGsktiw4QPgRkOThY9I7DYP/xyhePvRFztap9PfcH2xgMFcuWaq5ZyHKHr9y1UmMd5BmaJSoiWgd97M4ji2DDPAtoa2Xnq9gVVkyr7ePbdGiBYy9Kx8YBHnGHawE91wYMiQ3HWbaKeJerr5ni9X+QIgTvA+Kt6eLhqrRq1fHAd9lGvpgGGuP9yPmoOaU7hXQWbODYXn4mvRloS6WvrbkLaP04lDBiaEdEd6I0+VCp2umf5H/mh8sNxKg4rUFDrrREDBr5inWej3CW2yQoB121eviaVkY/K3w+MJPVcna+RWZo4RHhdeYBxMPwP19oEjgg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dZ/32ozy+on8UIU+AnKPUQ23IbERwU3xnSVrgUu1Sbo1TujMKFolRyidUiPPH9/ql+uMGsM5XvhMvncn+dwqirVDYDTIA4tX5JXRVcokWl/nriXLs6/CpnkJu+aA50eznkVloPo0SeJVihsRSc6a4dCoJx03qnS1gDGhfrMToOeel1yaATpHW1uysm49rDc1KraWy9TjhPLCP0j04do0k98vZeHLSKOKgghGi95LdODVhhpotVET/mBgDgmJBmZ8TTY92ShfKiUXjVV7eZ78l0MmgnnV4lG0qKRlnK1a3oE2vccBHJaHmgeTjykuZmBwEOw3XpxvX20RFudajMy5zhcnQLmLLxNDiUrk0vTqD9GnRyAHAEBKEVe4MQ4LbsB3P/jV6IBELmyaS7z/+W4bA2UZdKUr/0J3oL2mZSHoyioZfkOgk+O9WcQSOyYHm+Eit+2oCxWLuAeDLGdQoEW8XdhXisHOO0sum3AS56jVs1p9Jl4kt8On5Nd64zMCB/XV8tLmM/XqRP84TYv7kZDLZcAnGR//qr7g6FfRP1g10Smj1rU4WuqjEaE4MytVdT047Mc1NT8lR2uRJpi4TGhuetGPvNUbyeQwKnWgI8B/b+ct4XGb3/FkaqryvnkwoLHdsVdLJHTmeUDb2tt9ktRRMhGxwYpUDCVrQAFt2/GmGVk1h/5H/5e5mg7JZCLACE1F1dzAQ0cww9HSwh/m1E1W9/lr71fopYc3nMiha3uIXIOX9+cszOKEYZlaFjJUukdsu2fMSwOQ6+iJVF2tjxIBlqT1R3eg9ydfweE2ckKRqRCbMxTaRnfATW5wSI9bYuZqZu3k/ZpVUIXfGmxVu/eOsG1YIhJNwf2VdsbIFynXSMWRr5b4zDjJ/4l/IuzdGNHVVb5xlxWBCsKPrmTxh1JMsJD6SeS3vph16R7uMn2AznSmZC7kRw8Jb1p0qHlTNf88a2WDmkVPsP9Z47IcgR0TNA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01384dd8-adcd-4900-b4c6-08d9bcd5bbf4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 18:40:41.8943 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 05/12] avcodec/pgssubdec: Always return error upon allocation error 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: Eujhyex6VrVl Signed-off-by: Andreas Rheinhardt --- libavcodec/pgssubdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index 388639a110..2d5700a51e 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -677,7 +677,8 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub_ptr, ret = AVERROR_INVALIDDATA; break; } - if (ret < 0 && (avctx->err_recognition & AV_EF_EXPLODE)) { + if (ret < 0 && (ret == AVERROR(ENOMEM) || + avctx->err_recognition & AV_EF_EXPLODE)) { avsubtitle_free(data); *got_sub_ptr = 0; return ret;