From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id F119D4D39F for ; Tue, 18 Nov 2025 14:12:18 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'vBtG7FS1KwmmAWzKRMYOxxJoNPfaxMvv9P6TxzsejG8=', expected b'JHQWDyvFAjwmRE2opY6B3UFxkFuPULKCgOlXUWsL+OA=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763475128; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=vBtG7FS1KwmmAWzKRMYOxxJoNPfaxMvv9P6TxzsejG8=; b=5LoAd74U9gGTtQIqMjtQ52EgYwrKvHrPW6BiZ5EKbe0Uf+wX4RQ0USMVSyC0gh/7XfzDC WRx6JTY97KrBSQqXiATWauU5E2ILw/9GdrsfEMVGRSNxd8x8xFcWVWPfHgtTfntg3ypNxLW Fx9EHOgzI8vKo+S3G7obdbTZRKoxocTzO9cIEh1q79hNt6AHp3OTRwORELeWoQg6xBByK4l CgsjE2/UEpjRykuEA6CpBMR6NTk/uiLu9btY//Grk9zHBKaMfyzlxb7IG5+lo07OCyyn1ZX +tHJ5NfOvr6VCdzPTr5NlpdeV4pUVsSeYIBw9YYgTmiL+elclP02oZkPBLWQ== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 1910E68FF39; Tue, 18 Nov 2025 16:12:08 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1763475111; b=NcspN6c+T0DNDTc/vjOpdipsemiAQs6nzz8zDfl6Vd6LuXsodRgOrlS2xbM+CM9+SrUsU xB4G6B4645N02BytPUMXeIIvcMO95i6cvce4RRklfM7VAwxSOfuHA1WYEMefeyVwt5UYZHC Wk8vMnNnJdtwhK3ZaRmJHFokgv1DtOlx0WhzZbO1uWwOrFGDPw7p7NPQbbrpmNVvOG6zWnJ Br6yLvwuxr1k38WZfcWifsiTGhk3Rd0kXav9W9Dv1hdqyVI+hrcvI3+TxDw7eoxEPivriIp 9hyTPgp/K+Mk1Fh0+FlIBFAnfpFmO6erRT2Qf3yWY8RKdqQVOjBbHZ2pMByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1763475111; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=w5Vjg8orbhn93gg7jP/G/97kWEO+LGinYhkWRKk+fzc=; b=mOvjtw2cWRx7ExfV5J749zcyNd15iOOqbj5l4osBmb5xxo5hJMpg5T4exDnEeT7Kny5bV ju7DO3glxKOPjJqwLgbwwuEQAHRttmwU359PAlOhO0+DfeD5YvXN0xA4/em2JMLdJd4FvxI uDXRhZ5Ge/NraDmxquzb3Q0qhnZCPDJ1Qsn2BH/Ffg9YoUYtX0Vo3lleRK0gc2GP1TloR76 rIsLWU52BCqBRbBbY8mG4di1R5a+TKuT/RO9axYMZJSgxq9AZt9Nmp7tXpkaGKqYFqQapzx wOV5nkAB6xpPOtKpozDLUjFJWHR4Z5xUcZ/fEvM4+XKVJyAnl5MUkMQm4CBw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1763475105; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=JHQWDyvFAjwmRE2opY6B3UFxkFuPULKCgOlXUWsL+OA=; b=FJFjlCHn+v64sZVAuQ0gNpA4GLGvds9enAe3n4sNwS1oMVbn8+QkO4GGvyJqyvhYpIKMG v0iKk6ANGErWLcLY+5+skVXLVhxnKUvtFveIgTDWIZuktkSaGRmZHegs6rGGGfs+lGKQIQ2 8Z/PRjsweZXzSb7azMooEQenY8cY4M1HYTHT2+Te+x1HYR1iTQYmmgV+YXf6eu7ZGHl/zKN mEFQEmR9kfW4pDkRjSyW757u98KmrF/L67jQHE/WLeh+yAqqTV9rqyvPL2ccBCB8SXAZ1Qp +OVGCy6MgAurM83Hl+3WehSaeUZgugfW0fmu3gNp8ybi57hMDYmwO/TdM7tg== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1F34A68FB81 for ; Tue, 18 Nov 2025 16:11:45 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Nov 2025 14:11:44 -0000 Message-ID: <176347510527.25.425816776213947247@2cb04c0e5124> Message-ID-Hash: F7VQMGKMWIS35XXDAW4ZDQ75ASRXRGKW X-Message-ID-Hash: F7VQMGKMWIS35XXDAW4ZDQ75ASRXRGKW X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat/whip: several fixes (PR #20955) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Jack Lau via ffmpeg-devel Cc: Jack Lau Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20955 opened by Jack Lau (JackLau) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20955 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20955.patch >>From 837b0dd8d96c6f258bbccdfe5e05b40ebabf249a Mon Sep 17 00:00:00 2001 From: Jack Lau Date: Sat, 15 Nov 2025 19:23:39 +0800 Subject: [PATCH 1/3] avfotmat/whip: remove ssl_error_message since it's no longer in use Signed-off-by: Jack Lau --- libavformat/whip.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 6a9b208f69..52f6d32bab 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -300,8 +300,6 @@ typedef struct WHIPContext { */ uint8_t dtls_srtp_materials[(DTLS_SRTP_KEY_LEN + DTLS_SRTP_SALT_LEN) * 2]; - char ssl_error_message[256]; - /* TODO: Use AVIOContext instead of URLContext */ URLContext *dtls_uc; -- 2.49.1 >>From b1fd3386f090480581689b39356fe26a56599c3d Mon Sep 17 00:00:00 2001 From: Jack Lau Date: Sat, 15 Nov 2025 21:27:31 +0800 Subject: [PATCH 2/3] avformat/whip: fix parameter order of ELAPSED Signed-off-by: Jack Lau --- libavformat/whip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 52f6d32bab..22f7ab8e7a 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -1932,7 +1932,7 @@ write_packet: if (now - whip->whip_last_consent_rx_time > WHIP_ICE_CONSENT_EXPIRED_TIMER * WHIP_US_PER_MS) { av_log(whip, AV_LOG_ERROR, "Consent Freshness expired after %.2fms (limited %dms), terminate session\n", - ELAPSED(now, whip->whip_last_consent_rx_time), WHIP_ICE_CONSENT_EXPIRED_TIMER); + ELAPSED(whip->whip_last_consent_rx_time, now), WHIP_ICE_CONSENT_EXPIRED_TIMER); ret = AVERROR(ETIMEDOUT); goto end; } -- 2.49.1 >>From 59c726478ee5a9f424e4b4c00e6ef3534948118f Mon Sep 17 00:00:00 2001 From: Jack Lau Date: Sun, 16 Nov 2025 14:59:40 +0800 Subject: [PATCH 3/3] avformat/whip: fix potential out of bound read in is_dtls_packet Signed-off-by: Jack Lau --- libavformat/whip.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 22f7ab8e7a..84ab36b506 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -337,11 +337,15 @@ typedef struct WHIPContext { /** * Whether the packet is a DTLS packet. */ -static int is_dtls_packet(uint8_t *b, int size) { - uint16_t version = AV_RB16(&b[1]); - return size > DTLS_RECORD_LAYER_HEADER_LEN && - b[0] >= DTLS_CONTENT_TYPE_CHANGE_CIPHER_SPEC && - (version == DTLS_VERSION_10 || version == DTLS_VERSION_12); +static int is_dtls_packet(uint8_t *b, int size) +{ + int ret = 0; + if (size > DTLS_RECORD_LAYER_HEADER_LEN) { + uint16_t version = AV_RB16(&b[1]); + ret = b[0] >= DTLS_CONTENT_TYPE_CHANGE_CIPHER_SPEC && + (version == DTLS_VERSION_10 || version == DTLS_VERSION_12); + } + return ret; } -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org