From patchwork Wed Dec 8 20:23:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp854418iog; Wed, 8 Dec 2021 12:25:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVaApXnnJyfoFMWu5yy/DiR6VmAdn6HgKu0VVt6W3FsbzWxu9XNXCLHTcEoqrLH33RcvlL X-Received: by 2002:a17:907:3f07:: with SMTP id hq7mr10060759ejc.420.1638995101815; Wed, 08 Dec 2021 12:25:01 -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 nd5si8432872ejc.103.2021.12.08.12.25.01; Wed, 08 Dec 2021 12:25:01 -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=mipNm+q5; 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 583D468AC75; Wed, 8 Dec 2021 22:24:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33B5968AB42 for ; Wed, 8 Dec 2021 22:24:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXguVs2YGB+wWoUeMbb/iaw3V/9wrLfy5sYO2U/6KgtYLcvSS2PrqDoJWyQAx+0ZiksqQaIjKDQskJ4BetQ7R8fArqy+gYbP/dGdNsIGDzW6FMREMMhG7rUwT2ntbULQO9xmCZNf9zxza2AgYqgn0/fentWVw2GjhJ3U/BthjJifmmhRgYl32yTHPZ/bP/feIEEzCT5jUH/sBPN3L9UC1/GojZQKpF2HTa7GYSb4VzoMzATg6F0lpAzvCpuYmlfzmBbXMAMAoed4YKbXHhnwmyoGLZYgR81zQ8vx1P1qWHWpfqCm+QO/2DGNcpGTzU+wnhl6nKKWSugwQMJbgRHVOQ== 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=a7b1YnQTaNFHO5pOv0ljNyuaPq+CE1DJ81IU9dr6MDo=; b=WJ0UUICqOg8szHA9Lfe64GFd1DFOsEBY59XOHNv7qCFiJKN9G/nO/Hg7yHTvwoXtjKrdrwAtBxjm/2l58fUSVqe5Qxygwt6xcvZBNjzyF1OsyyQrdZfKQwByRGsHyJvV3htst2ukP414I9mFqWDsFbQ76zJr2C7WHBDPUmXwW6G73dvtrifAOEDPWOfM+tEmHS/uZcwJyK27QFqqaHUm2Fo2XtQhujhJdQMga2chMci7rJBlPKiasOiV24hmzz5olXJXoB1AfeE13u2px0nLaLi49H74IefrHQ8/A9o4JWbVd53eNJW71BZTqVNYwpWOONmkPK2y0vldc+6YLHOmnw== 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=a7b1YnQTaNFHO5pOv0ljNyuaPq+CE1DJ81IU9dr6MDo=; b=mipNm+q5T7n1MieTooiUD+EqEwyYRFCLekh75UYkHBsQhuo2ZJlhMRiD4f8tz3j52Q64Mjgmg55/wPBHTZycqiu4Dyq/ozyXtuHWyJl8qUre3T1q0PKc+SSIyqKJOXRwQr8cwEi6fZNqEGRXD462YnxTtzoN1yY2PpL++wg+h5klXIo8XX0KgaW/+EFxE8hXAltqlJnyhkRZcpqFO6tHd7YIoeK61o/c1Dx4qpOxQcYZ6GxKxaeY51HK95rIKuZekHv3o3nvAbald9nEJsHd8+Uueam5t89Flja+2JQngxHrfNibhJO7TqqeRB45l7pypF6oUKjY86nug2vnFB+ZTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:59 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [IEbN+DHiHUvTnnGh2aQ/iiEgFBXx9MZ2] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 46e1a6a8-2843-403b-ae61-08d9ba88b795 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKnymDxuRLrjurn4gviSgT/lfHdKnbjg+0tCltNLrOeBuKYfcMs9gIucwhx+T0gZZOx5S6MHzIGBGh3wRKAO2ksOLfCwcLQ1XnU1WGs0SoUKJ3+MVdTWtW40qrMZqybHIbRmumUHQ2tSOBR+c6pACDiQINU40USyMv9Hj4mScSpy27PH3KfNv7ey0d9gXy4XFIWlZapjE9B9NsFpacCsEtV9thrn4XyGHuFnmRuHAsMK5xXJaVUDU0G6dTEu4MgXG8NQdvninqZtVaw9uijq3G1vUuuvmDhaCtO4YDiP4bFOM2Hnii5KcBvqGhd84um5SUgbG+OxZAww71hvv48JghHZGr+LCBu+fnPfP0MApySoM0ScLkngdU+HysKQ1oyEcxZTRoPslqFiOYGdmbTaaioQWWfyIe1Mnaw8swXNQ8aCpMG/auza/KA8uESnDWhtJFi7nm8u5lrIDUn3AZtCY/7UJYXAko8Y/ua5HikcYSVZWErV+jDSH0QWaRYZZLXQXtX/iUOuohj9FVcZDlmaFp65zHh480TPiCJY83ak0YXSa/+WC1HkS5wLMkwrtxK1dNp5NHoBRxgJM/0d3CDIPVjhvl0k4GnIUBKS6d+fo8uzR8YqlnCQp6zaHr/Uhb9DaLxTI8nf9YJarXMnXuLVpuL7NI5uiDTK1j/SIQD+OzAKXfnONApo2hs9jTQnaPBKilcNPw2oJesCw== X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vcJjd5Al887h2Dh7GPpzcsglyTc2dLKZt1IRkGZP2ZkhgJ3VIUz+BbUP9rpsEsExNWl/xzvUdm5oMCE5wDFOWMSJ3BMxYqojFYVXHBXc2usOvKh2/ajlXvape816ilCgHYRqQgJOLEhuXPo47qbs7lZkrrniZrfOXqMaBb9HzeByUzOo7hzMYxvGL0ry8f0zVJq0+lKBm7ImlzVKZWJSrU2HWNx+VIfeQs95zeqq5/JclnSXZ87H5FA3VOyuhIbrBosIZxo09qLqWK7k2bHn02dVBln79xB8E1h1dwO7HxMW2adw2kcwfsVLOZFKdzywajNEx48J2XzQhN3vE/L/a6INCHSsY74E5PCWRbO2ulY1J/5UFDdlYZ7xw2BgO6+cIbqqqek5gEFE0qeTy4MZ/+2DB07DYUhIBtHAIxtwlV/cIxZRSE5AE3KE3yW98llTr9Al/uS3S3twHiBVS5aGvbOlhBeGaSH2nBGCVUI2tN3P6Ji0+Mc51AyvaACNpNPgkOCoHjfzT16qxl8Anit7GhI367+bTBgAMHbzIZxQMXyYp4PWdQ23AtfUJXVXJuqmEJlSxht8EYiV0KuMr0EZog== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ny0xHhmDfTHO/JmU92C6hOvaywwI1Uwx/7b+ZDnz9Mbbong59uBt4ab07cZ+kf2zd52+Wjgjolk5VBhmcNRegndxdA3P0iT+eQHjqK/k7p+ttcujU19a9YvSHLRbAB8HofoAzY7PksaWUmsOn6la5YPS3/YcxOSajapp7pEV8RBTdNWQyGJM31ArgGRG/s57I6GGE4fUCneerT1lVeNLZB3uKlTb7EVUykYqIc+Rz9cJf3F1g74t3Y0Y2FWNCn4FcPVb/PXc/BJj797amZeghvijh6ryzmmgka8YriQxzLiK71djZ3bS7apdFg9NhyqR6LIVcoYqXVgfvO5k5hOeqi3SFXi6hzEdd36hq646MhN70KjGY6YljY8EqeqDHZFRC3CiSCuh5OARVB4MlBAKdyZHpLTYIZiX4W4azS9SgtJVDF8i6soQaJZgWFhehe9qYdDY7f7Fi851ovMPE6G6rAntS1jmU/fIfdoIvKnUslVaKD7VNJHaOna0Zd0TRijFxBW4IJM6AkdHMz4a6FeXVifgdQuhUSRPwBrg5eVnxiEPzZ17Ej0OeVUBKr+yX8x9pHaqCl4ySRpHVTlwA2utmHGnJRwXGM/tUzAokThLdpo+IwG+CxxeO7HgZfvlPiiuiAft0PUICY14hBrxaY4huZprHBStUv4NSBeFStzo5ZZWByxnU+HRD/jGcQWTCCcpoi6Za/bCJ6yMk56o/XDP7kZ1Vg09c0oYSqW627Ym7rXpcSC/Lgyoieu3umf1OdkRAFTQ7RpQAq7qEk+4tbIY4GM/PsjoPSbqcYTuGrSanQQzKTr0X8IWVbY+g0TFRL3nh1dde2/hxWWw0/WkWCAfegJnj6RREuARsIaP/GvfeYZrBGRRn4lgOR82KBWDy3xYnXSWezea+vcTK0wFbUJA9Td5QIBKZQ3NWJQHAedut5AhpI8TVYpj1Rc+q8ymHzYnd+5fdejSUmzxA8wbD5UWLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46e1a6a8-2843-403b-ae61-08d9ba88b795 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:21.0181 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/movtextdec: Fix wrong error code 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: ZsHIwdVviCFg Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 63709eb54b..825632ca9b 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -294,7 +294,7 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext *m, uint64_t size) if (style->end < style->start || (i && style->start < m->s[i - 1].end)) { mov_text_cleanup(m); - return AVERROR(ENOMEM); + return AVERROR_INVALIDDATA; } if (style->start == style->end) { /* Skip this style as it applies to no character */