From patchwork Mon Sep 11 17:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp2282149pzb; Mon, 11 Sep 2023 10:26:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0x4grw6p/noQp6CTMsMvEn0JZzvaxz9SXhyhdRsGaMDp+a4aY6BKShGpy+y/4zA/jkAbM X-Received: by 2002:a05:6402:1b04:b0:527:3a95:3fa4 with SMTP id by4-20020a0564021b0400b005273a953fa4mr8466236edb.20.1694453207766; Mon, 11 Sep 2023 10:26:47 -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 i1-20020aa7dd01000000b005223c340277si6941304edv.426.2023.09.11.10.26.47; Mon, 11 Sep 2023 10:26:47 -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=VNMYSAls; 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 AD12968C962; Mon, 11 Sep 2023 20:26:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2107.outbound.protection.outlook.com [40.92.59.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5EA8168C953 for ; Mon, 11 Sep 2023 20:26:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=StdHonP5eqVWs09oaupmlC+2r3Ufg7CaTDnOMvLNrsv3DEk8CqOeaQbGafNrlUYH4YEyQ/6EJIoOCGJjHwolx0aLbLLjQDBRJJ40ZtbgWsOfYaY8WTbXlxz1klLBFuIlFcbM6Q4Mj3Dh9J9ssQBT8nJ9pPP5A7bL52gJUn3CajccJVJMgxOUtjUNEWxOZy1pPnl6VdaJhAJypqpSQnEt/hhCOhVPfGMucc+H1mersdJzzsm8O5Fr+zUzGyUoFZzT75vLMAiic9n3wknixP+71yP3oU8se9UqNa5xRvwFHo/auBhCYnCc4a6Thmy76XZKqbMnQMyLUk3KENgSgF/3RQ== 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=0g/IaoRTulH46t0329id14/XsaI6i6GPGL+Ne8K0isQ=; b=ATedSc+aqB3SlQLujvklWnRy0imFZUqFhU8uZudy7I8ZSNc36myi9lVhpItdIWNEcRCuero0fpXen+FFq42+1ykyOoFKmvvFA82L0OgyWpecmtf6cNBWR2Zy0IThLMrz/+36m0LZtU6UaFPcvFChChBxpajWmg58J5KTpkacwh7k9i3u2medRYjkvT5wvLeNJRhofBWMOIfxLV/IQT45qLSBbQrzKHtNCNEg+pp9+hnimS5EzEGONUqGPtO+Vw2NzeTd+x3s9PjHqSIc0JXBeSg2+iB9J/1szOV/8JS30WAXaq/kqoJq0o7bsBvK0YSF5tITFM7j4F1Tmodo9hgaRg== 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=0g/IaoRTulH46t0329id14/XsaI6i6GPGL+Ne8K0isQ=; b=VNMYSAlsLx0CTgtPQ5cC2IOQrCi0eZfzburpnEiWDeHsHgHClxtQrTUwq9NE4bLDNSlj2MABnwxP/bCjf5w80jDylQBQ1f/gDp3+reN7MD/oxUNmJ9wB2w7UHloH+geu1W1Ek2j1cOIK7B47B3Ior2h6pSmst+9hU2HJDauCCzW0AJn748RUAXXoGiDbMGjjAoRa7oFuGmdRJbiWmMHy9eriy6vwiYdskMXrwrpD9EZWVynVwWS/skKV0sVxr+h0VR5cy3GJLmY9nrzHtHiMyDPp6xwfiAGn/eDtTYxOO9nmW9YjPR+YuiUgDSuJzokDKhBHD49dFRbw9AlBIesTtg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Mon, 11 Sep 2023 17:26:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Mon, 11 Sep 2023 17:26:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Sep 2023 19:27:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZiZIJ99VNvrON0GqUyHbYSWOTcqYi4f+] X-ClientProxiedBy: ZR0P278CA0020.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230911172747.749706-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 380fc9c1-9e3d-4b86-66b6-08dbb2ec3fd4 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0lBzQ32eX6QlP2S4h/ZIokIOEi29iaNiYTjvU1GJlC38EFcq34oVYOwgqNtO4JlbBrP+wkNUv19R7Lr/BBfPZfvm714QCaRgn2PvIR6Nmzz4CjLunSoQfhBiKlZazITNM1lJlIJx2dObDb3Df3mJpy1zQf1w/S3QYByIQ39tmIe38J+d1VSbkZwMWBhOHz1OEYscjExj9eO9IytirBiEhx2LtgibSNgbJ6pamdwyCg86UhCb4zWWKpx8+PQktKgUU53xUvK5QVEV5rxSsvnqVZfzzoHzXwnybbONYDmLRR3LR8XIcpzqjhn9ST35TnfJKnDN+AVCs4TUyUm4SROcdgwk9itaJ0DZuByb8/+CfIB/92fWSEo1r/eOtO+XPRBXeL5iXCCxXkELF7TGYMaJ1AlmsB4wNYfNF3UjO3TZ/kptTrDPhkAMdFwF3/3tz+ZUmia/5VoQmdnLj3EoHSXgc0izShev0rj2bQCOBqfWt/58gnZVGqx5Rwvrz+0TtmbMyV8bVfk3XV2vIaxuZ0be0ubknXYZmT4294cpOyn6lVvQeRKFzgDaGAbhn1crhiTAX6TATzGfG6I1TnhKDX+zeGQ74p358M+4XMrPZgvOH2zgz6pE5+kVi+2Vjum4j1UU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jJODu2yxKEH5SlUDIvwu7xBeb0kWE5R1g2ciPcT5WDdzKEKVBEAAgL0bfBOjy90IvgwM2eIK6NvLXQvQ+TQN+R9Lc5VNvHuo5DEKC9ep5d9x8DDPq/+6zm7iyyYLGYXdgoWBCIu2mRX6laDeFFIV5BUpxbzEIWvXe272aGqEY7ZIOQMtxN62jDygO9zWh0TNdl5kFxVDU6vZ42LG4big2QAbnn/gcDrj3XUo+lJ1HTypU+HpQWBBIRDFZpusRRo+cffyqDGU2WA+EFwai7KsCFyh6EGVI39yrPhEQ7isLYnvqtZl0NRKfGIxVjTsIQlbw1NlsUFv+80rEY/sl96AEhpGJvXBWzFxANzMWYXPRowl2j+Yo+OsqobI3C9P8eJ7NIzU0ATs+rPDaFM808J+SSmptvj014FdIgOZq55sJE8sRf0mhj83fJaEua2mBHFDRvYpbODZ+HAtFxPoqgvLE9Muk9ZNpo6E4bxqi7QpYwyT2ZKLcWlR3etCCwk/a85oQSVN95jYeDXmgTEliumKgpYm81oWpGnac4l1Pw90JgXs7AEwABnX8lFWzhlvMHTH4wLfAmAg1tfp6InfubbYJukItK5q7pxUP4LOUGBPZDNFDLd93RbkYLERvtTKxwpXkN/Rd7UBBQy7T5st4JeFkTLtO6ud3d0J80Fs9Xvf4YIeR4S/oMHTEN0/2T3SKbjM6aqrrlzAAZwXLvqTylO23X8Dv8q6sscJvh6KH/EalXG7ZBBbyr0m/uUyhPqfDqyUwEyeF/uG5xDeBOqsBvLM6v4Qk2u8TaVkI/t6vqE80WR3TlJLRMYq8kguAsVGSSpjn3nzOrvsuToTkJGBJsCCd3R5D4144xfUprAuwnsLkQ7awZk7/FnZRAdYc4xixiTI6NEzcRqE1zElYBXjNJivvWJYje+15MRqfsUuTmT2DMJhkfWRIqgQSLYYse3Fg7WULb9Z3j+d8uh4XKT1tL7JZRdCLa4UV80S4hVBq1taJEebaihPZyw3otJfcugEUqMh/ONdZVEdT5QnkscN3biHCznqbEZZR1vantM01i9p0VMnaseNOjlLhaSMvbfdhvNncZDN1+O7Fgyn7lAfIfRhkzK89E8VbCU9oUmgwCBrizuXUYgROG7hANyv4S4A6ZOxO7A3qTfWWjlud9RsKkd/WkDOFYyATlfQTEP7cYK0u0w0GzcPi9xWW/dwfkfhrXE6wxsHLieq3kk6dMTfFI8Fen93gYhHjVX5SdQzh3iJfniwzDFtMu6xwZGct9GyyeQz X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 380fc9c1-9e3d-4b86-66b6-08dbb2ec3fd4 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2023 17:26:35.8520 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH v3] avformat/avio: Don't use incompatible function pointer type for call 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: LwIIrVs3R6eE It is undefined behaviour even in cases where it works (it works because it is only a const uint8_t* vs. uint8_t* difference). Instead add a cbuf parameter to pass a const buffer (for writing) as well as a parameter indicating whether we are reading or writing; retry_transfer_wrapper() itself then uses the correct function based upon this information. Signed-off-by: Andreas Rheinhardt --- Another approach; IMO the best of the three. What do you think? libavformat/avio.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index b6a192892a..b793a7546c 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -348,10 +348,9 @@ fail: } static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, + const uint8_t *cbuf, int size, int size_min, - int (*transfer_func)(URLContext *h, - uint8_t *buf, - int size)) + int read) { int ret, len; int fast_retries = 5; @@ -361,7 +360,8 @@ static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, while (len < size_min) { if (ff_check_interrupt(&h->interrupt_callback)) return AVERROR_EXIT; - ret = transfer_func(h, buf + len, size - len); + ret = read ? h->prot->url_read (h, buf + len, size - len): + h->prot->url_write(h, cbuf + len, size - len); if (ret == AVERROR(EINTR)) continue; if (h->flags & AVIO_FLAG_NONBLOCK) @@ -398,14 +398,14 @@ int ffurl_read2(void *urlcontext, uint8_t *buf, int size) if (!(h->flags & AVIO_FLAG_READ)) return AVERROR(EIO); - return retry_transfer_wrapper(h, buf, size, 1, h->prot->url_read); + return retry_transfer_wrapper(h, buf, NULL, size, 1, 1); } int ffurl_read_complete(URLContext *h, unsigned char *buf, int size) { if (!(h->flags & AVIO_FLAG_READ)) return AVERROR(EIO); - return retry_transfer_wrapper(h, buf, size, size, h->prot->url_read); + return retry_transfer_wrapper(h, buf, NULL, size, size, 1); } #if FF_API_AVIO_WRITE_NONCONST @@ -422,9 +422,7 @@ int ffurl_write2(void *urlcontext, const uint8_t *buf, int size) if (h->max_packet_size && size > h->max_packet_size) return AVERROR(EIO); - return retry_transfer_wrapper(h, (unsigned char *)buf, size, size, - (int (*)(struct URLContext *, uint8_t *, int)) - h->prot->url_write); + return retry_transfer_wrapper(h, NULL, buf, size, size, 0); } int64_t ffurl_seek2(void *urlcontext, int64_t pos, int whence)