From patchwork Mon Aug 23 13:16:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29739 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2072601iov; Mon, 23 Aug 2021 06:18:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwazGMDndTEtHvgAmu9JlhbrQSEgKAC89yfmtNK/SvTmPS+usf2jyFIdrBl+YZsQ5uMCI5A X-Received: by 2002:a17:906:f298:: with SMTP id gu24mr35898495ejb.334.1629724704511; Mon, 23 Aug 2021 06:18:24 -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 ne29si911312ejc.233.2021.08.23.06.18.14; Mon, 23 Aug 2021 06:18:24 -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=nICmeROD; 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 7CB7768A591; Mon, 23 Aug 2021 16:17:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (unknown [40.92.73.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF58668A4FE for ; Mon, 23 Aug 2021 16:17:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SHTZZc3x2KECWYRhk+SCgKcaJWIXhzdx6zO9MAmxE4rhnmCufXed+845NvG9zTWpHCAz0IzyEeQj3H4fJrxFXbipReAdGNpAok276XSJZEtrzenfcEyBjh3RxZTTevUWrYmlvvPhjH17/XNV3iFGrqvO93Hoeueef4mtEnGoWciMAyjVMrE8VldwSQc3p4AR8o3QoCzdM8vnvpQ6Z5OjITANJMbuRO+jT5PqNpAKD3Z7l+8V/3nZm8sqNMh9zf5hvgrDYohdVuvhPq9MEqsaP+N5GictlsFAZiIJifXJT2WFG4cXNNCEgQ15QXqU105BMPEyPEWF9+90fV3eazwF9g== 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=N/Vp9ml+E3Q06M1EptPJMAG8X+3+Zi0c5qbYcWZXc4Q=; b=KXdeQHJ2ZDmIRlfD0gH1J6DCZ2jbJHJgsZDr/Um5u0HCohW698DS9kAJDSjp5xGiMMMKiq7qA8T3FzskruW7zg9Bb5c6fJKDnguV5iK5MGENTjKrV8A5ccrmZkumhMWd7TWZogbpckBnW8fPtr+OwmmnNFDydY6PQnYEnT2uP5gbvuBIciM+PSzUFx4gLt8zUGsdU5gDX4HeeDGmbj7fefO3gJ1mmWcsPP2CD4wq74qSQAmRmNletxT2k08th+tOzqyqxFeMVFIAUNgj8j5l+cVhCI5Gg5Mga0KqRkTYLzFeZ1lcnOOlOLZNs9tK8sck/vi7bMe7zoh0/8C6w4d9cQ== 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=N/Vp9ml+E3Q06M1EptPJMAG8X+3+Zi0c5qbYcWZXc4Q=; b=nICmeRODqi1/fMafc5CEljiWTi0i9pDZ1ErDcViyKIowXB/hISdNJkzAsQgMzxzV680uQaZQ6rYfO6S1a0QIb2zRRrKfn8NwXHVTQEe9kMXOtCpasbWF0Os/1XJ09jOI0CymuFHUZieq/2yUom1TBKuHmODJ3xVJ7fwI+BO+CW7zMDQvBDl7G+nH6e+dLdDiaNFgTBst/cvfBtabacYfLrHZnsGqymqih2q2nWa7AkIWFm9JZ0g3R4nTHtRhb0j0SUR2ZBMaDR7U2UdXvoPyZVjiNg5tuEHtnappbuUv9xvdIpnK6wsktSqytuA+2zYAmFDai7iw6aPUYS1E0lQFYg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5250.eurprd03.prod.outlook.com (2603:10a6:20b:c6::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Mon, 23 Aug 2021 13:17:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.024; Mon, 23 Aug 2021 13:17:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Aug 2021 15:16:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [MJkJ4PZP0WLNl9v3uzcvlAg9ATIjRmuo] X-ClientProxiedBy: AM4PR0202CA0012.eurprd02.prod.outlook.com (2603:10a6:200:89::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210823131654.1837818-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM4PR0202CA0012.eurprd02.prod.outlook.com (2603:10a6:200:89::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.19 via Frontend Transport; Mon, 23 Aug 2021 13:17:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4bdfe30b-face-471e-6848-08d966385044 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UK8FaET1AYvNgCP+/z79etDQA9EYVbSkeekD8U/a4m8BmR4SZagT/EzwkmdufTpoTcjLWnhDxOuxsXjUUgrrEYUz7PW2kQ5GVH5e8+aw1AjlhocNOSWTOjAHlYVAYMPAauABXVGaDFd8PHKdioel8Dg1JoiX6CfU3g6GgN4cGBddc/OtOOC7YYV6fF+97c0hbyZWd5po8uqR0vSrMVNLdbM53WEcMWUg8DYk1lF0MLb9eTMi6Q3KXw5wtnlbaJ8eEpm2NXGDxo+qkg/LcdOhzGiRUwYos/7hAvj7bFWC0jZHNbG+vMECO8cuhYwLBetJTmSeZVYGTqI648l6klieYc+Bvmp2nc6J7xiB3nV6Twz4qCj7JQ4X9MG5jK7PT8l7lzUn58pJAW51xVy4EwnZtt8thCn4LeCJl5M7RPL30K0iFBo/dxIyXlymlLd3AjdvCxM3gshUzNi4V6w6Zq3zrsDTKj2WfFDxmQBbPjh2RjlpdZPlqFjgSJCE5UZa/4+tqN1/YPqc5vjrgmwx9rn8wmp1bSb9ol/vgsqqMz1+8mxURYLbDyxN3Cts/4SFcwsfl7Ksn0kSwvzUV/bXL08a/0UVcb40nUQy2s+CpW3KKg/+WZQHrjdjXneIu3RKIpRbBeIw8tuV4nv0N+JotZPBbi0PpEjJua3KkSvdYaoSUZxwqlHXi4gS9hWmAO/FuFcWxnjAvjMzPU5hA== X-MS-TrafficTypeDiagnostic: AM6PR03MB5250: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fVDF6XdFyO7itPU53YyiYJSLa6iYQtJhS2GS6U9xuTgUQny0lnrAzB3fmHddHVcCzvJJKCQE2PmOP1VVlQtpa9gcpBlAQgdQyKbC1pikfZA+lQiJ3PY8ifRvWKNnA++Wqjfju1B3czjwcxbKn+NjslFjgSTKC6q9bg4+EiSFN+HX4wVjg18yJs4mgOkmb2nD+/BWn9QdLVkid65OciCoPt4zoLV31Oqevzr/QZjAftCDZWQJKhyBWOlrh1nqaDDpsuLdktzDTt2IOuuVpJQX0H0g4cJiyz2hyQN0OQP8Fm5G1okVh2N8BDaJG3mgR9EL5DtomkbpNkQMOTEbEZqbEq8jFlrYg2juXlbZymSjP9sx0GYBqisE0ul/IK1CE/NG3WbQo6mRJhIjOkPgliisEpkwucN00Bl6zHNApWhyhdItc6Ez+lHv53VEYd2La5Ai X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cS69qki6lokkXzgqNPq0A50W1rtYzwSrRGD2+C9XiMD2AuoTxj3MOmMfG4j+VUnUs5cWd+RAPJVGCntjgv7BUjzcN9z+15HUVQ2NB0SkNPenGBPyBNZZuGrcSUNMwod/zWZ1i1jseetFg88iP1Urbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4bdfe30b-face-471e-6848-08d966385044 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2021 13:17:10.2628 (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: AM6PR03MB5250 Subject: [FFmpeg-devel] [PATCH 8/8] avformat/flac_picture: Reindentation 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: E0WOhRo7YWRB Signed-off-by: Andreas Rheinhardt --- libavformat/flac_picture.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index 3b69654ff6..0effbf04f6 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -150,19 +150,18 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t **bufp, int buf_size, data->data += bytestream2_tell(&g); data->size = len + AV_INPUT_BUFFER_PADDING_SIZE; } else { - if (!(data = av_buffer_alloc(len + AV_INPUT_BUFFER_PADDING_SIZE))) { - return AVERROR(ENOMEM); - } + if (!(data = av_buffer_alloc(len + AV_INPUT_BUFFER_PADDING_SIZE))) + return AVERROR(ENOMEM); - if (trunclen == 0) { - bytestream2_get_bufferu(&g, data->data, len); - } else { - // If truncation was detected copy all data from block and read missing bytes - // not included in the block size - bytestream2_get_bufferu(&g, data->data, left); - if (avio_read(s->pb, data->data + len - trunclen, trunclen) < trunclen) - RETURN_ERROR(AVERROR_INVALIDDATA); - } + if (trunclen == 0) { + bytestream2_get_bufferu(&g, data->data, len); + } else { + // If truncation was detected copy all data from block and + // read missing bytes not included in the block size. + bytestream2_get_bufferu(&g, data->data, left); + if (avio_read(s->pb, data->data + len - trunclen, trunclen) < trunclen) + RETURN_ERROR(AVERROR_INVALIDDATA); + } } memset(data->data + len, 0, AV_INPUT_BUFFER_PADDING_SIZE);