From patchwork Sat Jul 24 04:35: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: 29041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp1976225ios; Fri, 23 Jul 2021 21:35:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhPc428Pg+9pTGBD5Q2UnFFsSrZzez7SsR2/TBM2WQQCgju81Mto6GGhsvy1cUJivV2geC X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr7606324ejf.416.1627101336053; Fri, 23 Jul 2021 21:35:36 -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 n22si3881994eje.429.2021.07.23.21.35.35; Fri, 23 Jul 2021 21:35:36 -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=IcsOJDG+; 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 95395688178; Sat, 24 Jul 2021 07:35:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064036.outbound.protection.outlook.com [40.92.64.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2627068003C for ; Sat, 24 Jul 2021 07:35:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bFjGQwcfX0/b/LBGFi94DICr4i04iqnFxVina/bVEfblhB+lX7Byv9snmnrgdW+5A1FidfPIH7Ato8FrKSUytPnytshNOiFZqkefYDBNqJfkLwwaPazVPEAPco0L5OM69G4pHygf8eCYq8h/JvRKXAQQSzNJcDNAlSJOG/jw5r35yfTKpi7sMUeNInAnKewjruBuOLE6XwvS/3vVWWThzBGCLfUI3Nc/rFtnN0W0CqWHaYyYftcua+4ykMS8w3dqXkehBEAf6USjc59a3ZG/PGwXMUExdULnyqUL0l3d/TBSpnD1ArOKX9upiU+7z3x0BGjt1UlP3c1oBvoke15Hmg== 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=GAu31TUZSK0LGy0IVk3OEMor2qOnSZiqLISRbfW6UJk=; b=D1IESWR6vwSLlLQ4bPlC0BctNWwmw8GaewEH+3j+uYx9xJUN5IgKcRXdxobGn6v+tS5juuFXsDpNVwcNL4JUZV7NVx4kAxoNSvuwTz1704suq1OBA0wkrQAGEAkXRC4rRfTbhBDfNZrG20O8Bwe4s3UohUyFRIhlOvsDzcphs2uavm6p5czWpvovBlUAKGONuNV4z4wis4KHWmsWAzgHK1A10MPB6Rt4u8w/Xtl9VHebDYfOvqCt1PllmW9DFdq6DN7gZKS73rNJw75lqV8d2OSqfEYz05/uoiFDsFTbwsZ4fZJHHuUYa63e+uNX3buVDoiQTu38Wqw9W9gPqmO5VA== 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=GAu31TUZSK0LGy0IVk3OEMor2qOnSZiqLISRbfW6UJk=; b=IcsOJDG+giIzaPVeclnja8t8JMCh7w0J803T8LeVh2NS2T30ZPzIYYSTRR30zHwHdo85Nj9S60TZzBEvRWO1IhWt+/PMedVsYhxDlYUbPnhaLkaOBCgVURBWEWYs0AYsLCS6Z2NCGqOdWjx4A7lDAHkBPGyZHy7g8+UgRcbNH383xu7+sf0Ob5JAm27Vt6GzroW9EkrLJ+T7Ftz092QDc98Z0E0z03Rrea2RuSUG4PuYsoqEwWDpSO808jLkTTRPYhiEEsYVixpOgc9MBPcB2IECHxkOv9iHAAcHDbs51y2KeLRZp1XtDCm9q0uX0w+/Kr5Flx8B7B2WRQS8CK0HUQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4534.eurprd03.prod.outlook.com (2603:10a6:20b:a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.32; Sat, 24 Jul 2021 04:35:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%7]) with mapi id 15.20.4352.029; Sat, 24 Jul 2021 04:35:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 24 Jul 2021 06:35:14 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [IBVtjgaAnHyEfOcoOrK9SGllOl2Bnojp] X-ClientProxiedBy: AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210724043514.2000844-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by AM0PR02CA0034.eurprd02.prod.outlook.com (2603:10a6:208:3e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24 via Frontend Transport; Sat, 24 Jul 2021 04:35:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0694ffb1-7064-425a-2197-08d94e5c73a6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIe78BGW2DBzGLZ5KKRskQLperzHp+U4QOSmL+bfsmm5htiEKV87KGWyhpixrtwe1Gnq+hbeZKQ9wOjo11vGpLYN0BOxgP6lgeMeEmoJHHaaNc0QZ4gOtLHltzy/NILoc9KIKbz71HDn9idFm02TEua4LcQJej5J8hd2yrGdugG1S7fJlBn82zaB2TeNEYXMaLTDTcFShqrTljdr5f3AYjsGg5+yQ+FrpGf9QBvJBV9qAsVL0Vd+KO3HtQ0mSxZ3Sd+eyG+YLEPoP77ZiEHSUaBpeHrYKiX2XQE7TgCkdpLS+FOtSdpUjuo9qU81/a2bz1YNgJa/EWbjDJe7FzAqGTZej7m4FFJuku3g6jBLWtPvJXwakV+bvayCpf5YbXArU3gLHCjsip35/YaJ+ZxOpAHELJgGylLeWgUfCYzsDi2AgsdF7y5WaeeyMGoHGuAXaZhHr6s+GFmMDqXI41RP8dA+hajjGTDHx7StBt+Oe0npjCbpIhAL4HaI8xezVM3nQ71ffEGXjThc2xGVRdOG6PiL5lE9H5Ap5a4cozDxnlZjctjmoIq6JYjOfdR5BicTIca7p6meiAv/8IF6qvp2MNejvhoSY7PMuOm8jp6NEG9cqBKrGSC9RSK84ACHV0ny52hRzi/9i/jrW6hiBN066wKbDDPWwjFbvooCHmW0F9/7JTQvPT3Oh/zulDQ3MigJ2vITXIaWA4ODQ== X-MS-TrafficTypeDiagnostic: AM6PR03MB4534: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ozPPNeBQAVn8H79eKsESTK+3K1UT68blXTHC0P/x6f6FN9fzytoWNeU4x1JOI09+v/QJE9//8sdrUxUaHypSq99l1GNKfBRi9XXaWiqKJ5+1z73BIgpzTmA4Dr1lB5E/QE4Cw5FhZ2MiQ5dUa+ZKyNauRrU231ocONaBLceV8UaPxEs/LRdEFw/NVu0TPk3QhVsLKx1qm0/JHK94Pm0Jg89BhA3YZm6WqWcs6ors64z7Kahm1+AT3pWi6iTAMcRne1cyk9zcWfrr22R3N8oZ7DpaPYxp3osrC/fAudPb15+g5mhOIyE9VUcxFeLc/HT8KuyCX9Ldm5Zj2FJ8j09W9GM61hae6kraTbe11/DM9VOam4Ao3DvfvzoAOj7Dna6Q56l36wsxIGEWDnE0lerkgHQ2qoYyQankYQRdKxf4LhHmfelSciboxwH/57bxS7Y+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /ang7tAzRplYtgUjspXHLAjX2+skEmrGIC/06UL2+sB8OTO6mmeXZ++9xYO8tN+BihvmZ4f/PeG47FdR89f13mdoWA7lhYQzdf0YXiD6S8QVHxFUYocmNng1ELYyLJ/OEXY57QXqXHp4JAxEGxEQ2w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0694ffb1-7064-425a-2197-08d94e5c73a6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2021 04:35:23.5931 (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: AM6PR03MB4534 Subject: [FFmpeg-devel] [PATCH] avformat/mov: Remove pointless EOF checks 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: 7vAULMXwTA9P 9888ffb1ce5e0a17f711b01933d504c72ea29d3b added checks for EOF in loops in the mov demuxer as a precaution against timeouts; yet there is no I/O in the loop when parsing the STSZ atom as the values are read from an already read buffer. So remove said checks. Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index e0d805b07b..2eab9b8c11 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2884,7 +2884,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) init_get_bits(&gb, buf, 8*num_bytes); - for (i = 0; i < entries && !pb->eof_reached; i++) { + for (i = 0; i < entries; i++) { sc->sample_sizes[i] = get_bits_long(&gb, field_size); if (sc->sample_sizes[i] < 0) { av_free(buf); @@ -2898,11 +2898,6 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_free(buf); - if (pb->eof_reached) { - av_log(c->fc, AV_LOG_WARNING, "reached eof, corrupted STSZ atom\n"); - return AVERROR_EOF; - } - return 0; }