From patchwork Sat Dec 11 18:40:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32299 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3358270iog; Sat, 11 Dec 2021 10:42:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJzGLwqNHutXSDHpqb+hISBriKAd1ev8OqBg4jXbL+YyIedrQl1JCAqNKGgMqHq+Kw2sfYZn X-Received: by 2002:aa7:c390:: with SMTP id k16mr48874506edq.161.1639248145026; Sat, 11 Dec 2021 10:42:25 -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 qa16si11931832ejc.560.2021.12.11.10.42.24; Sat, 11 Dec 2021 10:42:25 -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=Wfs96p4j; 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 C78F668AF7B; Sat, 11 Dec 2021 20:41:16 +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-db8eur05olkn2107.outbound.protection.outlook.com [40.92.89.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 724E168AF75 for ; Sat, 11 Dec 2021 20:41:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZcVkz5TfALLRl/+L46m93wl3SdFXq3OGWOV0KJ5kJ1oKfj9fWKQPW23U0LZWtoAX8pShjkeGO4Ojbr9WoC2ljV2cvwd3GWm2HwA8R9Tz6MOKPJ/8SbiUSKLSFrT6A8rwLghIbe1v/0rf8UVpl73F1Ze+kau7MBnB+IqhieoLd9mJ4fBgNg+Oos6nKxU99W+E4LkneqshZj7JtbnzDpr6AuAT059B0SCLDwhezJ9UxnmyaQhbcL4qZRShYbJ5MzkHC0oxTdphrqYzR7RI1fNXLMNjiz3KAyWHIHlKx4UE9YHc/rZrE6s0csZLWUcCUnli+dxpuFDTcz+5/Gwf//ir+Q== 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=spTb8aFvLmW6z1+hhmJKh15kU9JgxdHwzdw7ItDm11s=; b=jh7z2CtCa0KnRDKN3P4/TIIfQ3H9Pc4s1dRwdAWRotowy4pOlyo5tSnzrayADdFRsZv5UFI73iuRnGrzPMclNPKGHOK5vGQ9uQNz1oehlLQHNkqCxCd/KDzKPF1V/o12+5XGzb3BsWxlg0qgnBrNacAIPgEHFCcCo8xxyJ5GIzkCyI/IU42jTcSrYsQZ2xvo7goQBzPUeeNQAMDyJwH8xTXe2m8MCtq0XBRdP/qh1SD9lKLT/F1fkR3vNa0UbjvpjhbnwrFO9Ok1NASGdTvdTNyZQQv9sZ/LsPq0EnWlfsocR3SDXb6sxEpLbDyw7wq1JLquQqWTJRv8jQtbwrhvMw== 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=spTb8aFvLmW6z1+hhmJKh15kU9JgxdHwzdw7ItDm11s=; b=Wfs96p4jJel3KyuY+U2OiEAYoRbt+GZnSGtsiLK1Xx/EAgQLP/UxyjY1AfcDjntSvS6/wG9KHDKc0Frkso9M1gUuXhAOXO8eaLntJ1LQvlERqkA5PiZkNctOZtMgBp/YdSTJYYF8iTdZdcTZvPLFD/7ZtY4mEoPh6WBH+w0BQ+sbQsFkq4hSKxwIdUzXuZDPjDcfu4gRbYGMkkEb5ZdxyCg/OianBsR2Z5F/ZAnb5+H9jO0KUkjXGzRh1HV30P5Y6wxCfeFphyXuIR+tja3j4TGKSs8mEUdk5G6JBmLrQ7pS6XlLWGrOeD0B3mfjv6CMIc9/F+qAlRKKKetwOH9uhw== 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:41:14 +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:41:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 19:40:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [n6P7vcABm8MGUuOoAyx2/fcTs1EniBEA] 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-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 29aa9f55-8ada-490c-19d4-08d9bcd5cf28 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWxJUMtMcNsrGqEGMDh6H/ucibuup0itZTeJtUEEXSQvScJbwjtIdv1q5PJapnppAWbePZis4AuX9saAP/uUSFqmE/WEv0ka9sLXXcB3hxnYZOuC+ZXwCYZDN5AtBPzwc/gtf3z6bV7HZnpCERu8+7xHkEcTlLI2JyuFyqdDOncamgW09CkahriIOxi067IAZbqEAOQfCGkra3AN1d58xAkuvofsK8PAw2D81LC2/XnVHH79qZxwNcedsNywYGEb3I5rvGOmQg59Ep0beP7xnyXqh3zkLT/pRIvWxMYAieWNKDhqhSrlEmL4yarGeeNdnm7efLLshjn5/G/ESHIbvpv5dPDO1E7yWltM/qgVmgqJlk+01SpL/cTAThR0G9YwSCklxo8qdIS7WpGrgUEDYTiVIJuuVof/X+saQrVED6wKHxsj1izECdr4MVplqaZdSozEdOZyuchZoKhFwjzCedt5qEew6BnOZdmyPFIQJLuaOUx6WmUbG6BU2Wks+Q86QLFFHMlnqrBdm+4AJhkzA5wnBQrd8qZmJQGg6kUmB77skUkT3jBeGGkxVMCHmKOryPZqSV5+zNQA/VEGIe6qBrI+Pi2DLDbO9qWzeSiXzkPFOpV1761eRwRL5WGlsprwBM93i64S/5yKrZZZYGnGM63EloOQ46NxN9Hhvavp8nReDFDoIjVqw8cy6Odhc2esF5hXFjLGRgTz6DSIvwusrcRRx6MXnMnZq4= X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vIewoTyY92B2Czkv/H6Xr22YlhuQIUidxA1Fal6B39xZlpYH+OoOPXrSGitQ62j49PC7sAiJUToCjNfpkuspP1FsMrgXhV9b8InhHKMTXJVBDO9/YZxP5AEl2Vrnt5260NhgG0OTq00bA8ZVCDAxLJWM8Q5cKb3z4oPEMnJ9JStfbWoJNGdetR0y1BwB5+F7VceLDFMD1pE5ola2S3aeZskoyf3DeFlzyDu5ElETKP6t3sLUgt8WQ/G5jgRNQd9SgFxAYj+dXqU3sqnYUakc1xkQWz1e8E1Bd+wbCT5lORQRO7QrtHepNarAnT5Nz6suhruqXUG5dbdtbUBJ1Zz8NmbaMeOWA8Bd6PNawHkVEMQNVNVy43ORUU88XRR4VG4jGVDq3bG2zeUqg+JxVK1v0bPJcc00mO9NrgKO+XbTzH66b0/+VTj2C1QNpM9iZg0vqRXY9AhTTMec5vQogU7rK2gTLGNtm2oOlPEI+zjIDMRxImbzKh3qwlY/slaUTM5+s/sbzhvNNz4ra+XjXZAoXGnjjFKGaXHfsFa7XifdCjUitFh+yoelSXdKYlHR+VDCIL3cLqmyjItjpShEBhV75w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zLrVnWLuIGg4SoCn7T7mOGKdJPE07NB97GlwR4c4FP/e2OVRtiU+lxsDhzSWYj65vraTxOfCNXa0xLicHDJnJrwlFClWAgqt6z2Gd4uY4iGHjz7PWR8YqXf9UzQbh3/mzHweVqhdfs3hhaJyWekD58Qsoj+mGXYmNECvhvi6/kQ0ulp++G6Lf1KKE+xSudqeKf+s5RlZMlyH2p5VhtNtM4HjnmbcN+7ALioDA9i1HQET0K4zOWekUGy9E25wHTc75rCz1rWp8Ritciny99sylSJRn5QeX7CthxoIStt+/a/b4eun1BUwybI8/B3pooUwp/N3aBSTd53tELLpHdr+KG8PNCydsMcXUtjEYIQS+dCTcE9P9nLX+SRxAqNswP4VWtMG9g7Vj4BZwfcGtOxGphc+ZJXESd8fVbTe3obPeFiHpOCi/vtoCWcw8OTFnHxDPe5nZdyQLsFnFvDxquXy0+ZWQ6i+W6WSXjSdj0XDMe4uL6ISQiyP4OBDOMNmvywIcczVdG07PjB7KhpZgIGkc9ol/reqJKKMYdosQXGEjakhsMs4Brlz5S5gbmW528zBhibRmoHWJZVjq20XLhAVn1THVNS56a02IbBu221yZfnGHIw9xzAw0AwrE/IEc4mdhZDzw7RMnTRGIvsyD327V1wXEJUFZsb9YAmHnpzPioqDIOhrudg+PGYryagPtiAz804XfOlUfYFvuw2um0gloXM4N3nIU26BcusOg+RwBxRxArOYkImX3kF9t6K/XzH1m+2l0qDU+obmuz1bEFZW5d1NQ9SNtNs/EaHyUnicFz1Fbi+Ua3VWYWzm0LvfUKZNmlV0VSqA90mVsL9IwjU7MG/KLW38/CzMgIMN6unmyDBXCDMASbvYbl/tngpJgSKxYNmfTcf6rxkIvv1AaT3VQMpthhCfqipGFX7yQ3L/r8j4FX/gSOEvzIOrUvOi1ZifoY5Rc4EnABs1jEo5c/YIzQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29aa9f55-8ada-490c-19d4-08d9bcd5cf28 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:41:14.0765 (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 12/12] avcodec/decode: Reset *got_sub_ptr on 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: xrY3BHqkOFsW Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index afe2c0c3c1..0912f86a14 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -862,8 +862,8 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, "Invalid UTF-8 in decoded subtitles text; " "maybe missing -sub_charenc option\n"); avsubtitle_free(sub); - ret = AVERROR_INVALIDDATA; - break; + *got_sub_ptr = 0; + return AVERROR_INVALIDDATA; } }