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 2D30046C44 for ; Wed, 17 Sep 2025 13:34:45 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'eLlvmUaf326+xDWojGa/X7U76j+wyYaNIBN1I9TcPrE=', expected b'iu5j3EpCR2RT4L5ae+h/vnIYNChDRl3ieb77a6RQZXw=')) 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=1758116058; 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=eLlvmUaf326+xDWojGa/X7U76j+wyYaNIBN1I9TcPrE=; b=vez64GqmFbscpjFqRvqjrwfbDdUKkIUuwAhuNuRdWJjS/0EcmW9S8BTMJ2ElRXWwVp0Q8 /y9lya4/k1k9DVXlfU51StE7sUJejuTWUiO3wSbXG1oRwyL3UkLJTWzS0pBNVlP+5DAS2Xg DafH6OmBmoDGs311jV7H8sygEQvlP9TB+0l3n0MtoCIuy4MwA20tQJr1roM5qi8flNB7gy0 1yW2QyRCVYgEuD/s3N7cW2GPMtIjhFSsePcWiSWiEsAdeFMS2r5lzbd9Hqx+Djq1YVVEeN7 ujq3vhj07pM+ZLuzXX44+G59Yg3BN4fK4H45FkZyzqcR341A7sDGFmJUH1FA== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id E655C68E993; Wed, 17 Sep 2025 16:34:18 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1758116055; b=krloZ9drO486QU4gsZWJE5inuyhlTKx1jUfpW6kJ4ULpGdUVlIdLlio/zKbl+bT4vdtuq 7iwt2FH3/kwko8aFXdzNQf8xpCqKIw6JPmUY/cCEwooie0bziTnOwUtI02Gt3ZwJyUjdiVo sTnxvObwjgYRAwjWjIaO/cW40v0tKZHGUz5QHL0xf1/kxm9VUSaL2yZIEkw2H+1zaxRqg8J 3m65V3xqU+DE6ajBYYVbjwmIZG/vLeER4tpecU+NilIxRotdRNskwj3xWvVExxirUM7dwfC CDygW97XsFbuVGXxmd6Mptf9V65ZHS89Q9CD8DeF2tJaHtSOG9yZJj65ACDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1758116055; 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=dwPPBQ/wFaFifdeKpGfc5jK+IA4T9eo8UHb3u1BlOw8=; b=Xs/HAJV5fBL3s5SJkMNvkKWzhADtmwiaqyCCOMb86pKWfB/IxDJuuut4pLeNYt9UHzIXi Yi40cU6E2YZZSZj669VRN3cfLtila9XiCYgUIYToNVi4q7R3net32MmMcg9/GHX2cgDZO7R 4Y+RPI+G5Pv69psrIeN1hVICUP2sqRX96BlqeaXCTZ6Nq8gMBkIkL4sX9GwWgwVtk6hHmMf tWYFNNNV4zvIaQJLwSNyLq39Vp3t8GWM+Qi5ibor7S24+O95KspzN29QsSrZzeDQdoM4lcB UPJ10HdHEpFtwi267kNwy7XQ2iKiTUAPbzF/0QqKhmHBDee4NfSx4JQG1EVg== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1758116045; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=iu5j3EpCR2RT4L5ae+h/vnIYNChDRl3ieb77a6RQZXw=; b=d5adqoBlRghJ8+Qa1QTtFR49wP45Y5APkXEQ9ou7FGgn4KOS3VUEmXFur9FYL7SaWfZQL tT0j5Pg0EuhsSQ3JGVFoUDvl8ZLUZYw/oeqvsUpvK9Kbjgds+vTKBpME4yGp2CPP7xR4bI3 ugH/OtmERsbuWbYthsnkkNINewlwzD3A8WdPy3gbdCRsZmK1zlzVwgAUAq5DFMq+WBFQDNJ XmK/nvcnlN9Ob/+dhQ+vCT3bCUoxBOmqo8OLYIot88Pstpp7MgXDUvL9vER6zQL2BPdMdPs 4lQYlIYG9FipFgBXM3a5hxhmLcZZ5tBLN1wKNggUaZPnwFw+wiao9GmecMng== Received: from ed19c606a818 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 5CA9768003E for ; Wed, 17 Sep 2025 16:34:05 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Sep 2025 13:34:05 -0000 Message-ID: <175811604557.25.14186002587820659341@463a07221176> Message-ID-Hash: 7KQEXNYG5YNOVLPVAPWLE6NP2VWJVR2R X-Message-ID-Hash: 7KQEXNYG5YNOVLPVAPWLE6NP2VWJVR2R X-MailFrom: code@ffmpeg.org 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; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Small RTSP fixes (PR #20541) 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: Marvin Scholz via ffmpeg-devel Cc: Marvin Scholz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20541 opened by Marvin Scholz (ePirat) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20541 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20541.patch - Fix leading space in the RTSP reason string - Avoid logging invalid values and instead properly log warnings on failure reading RTSP data >>From f6d11e63faaa7aaadd1e27a18a96a65581f50a34 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Fri, 22 Aug 2025 16:50:34 +0200 Subject: [PATCH 1/2] avformat/rtsp: do not log invalid values When reading fails the first time, ch would be uninitialized and printed in the log message. Instead check for an error early and log it properly. --- libavformat/rtsp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 10355b89b8..13507d1858 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1239,9 +1239,12 @@ start: q = buf; for (;;) { ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1); + if (ret != 1) { + ret = (ret < 0) ? ret : AVERROR(EIO); + av_log(s, AV_LOG_WARNING, "Failed reading RTSP data: %s\n", av_err2str(ret)); + return ret; + } av_log(s, AV_LOG_TRACE, "ret=%d c=%02x [%c]\n", ret, ch, ch); - if (ret != 1) - return ret < 0 ? ret : AVERROR(EIO); if (ch == '\n') break; if (ch == '$' && q == buf) { -- 2.49.1 >>From 614a5682ec349a1ca3daba19613ae93343932e08 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Fri, 22 Aug 2025 21:41:26 +0200 Subject: [PATCH 2/2] avformat/rtsp: fix leading space in RTSP reason When parsing the RTSP message reason, the whole remainder after parsing the status code was used, which would lead to a leading space in the parsed reason string. --- libavformat/rtsp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 13507d1858..d601d63a89 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1274,6 +1274,7 @@ start: if (!strncmp(buf1, "RTSP/", 5)) { get_word(buf1, sizeof(buf1), &p); reply->status_code = atoi(buf1); + p += strspn(p, SPACE_CHARS); av_strlcpy(reply->reason, p, sizeof(reply->reason)); } else { av_strlcpy(reply->reason, buf1, sizeof(reply->reason)); // method -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org