Skip to content

Commit 63edbef

Browse files
committed
RTMP: Ignore FMLE start packet after flash publish. v6.0.184 (#4588)
1 parent 0a4be97 commit 63edbef

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

trunk/doc/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v6-changes"></a>
88

99
## SRS 6.0 Changelog
10+
* v6.0, 2025-12-03, Merge [#4588](https://github.com/ossrs/srs/pull/4588): RTMP: Ignore FMLE start packet after flash publish. v6.0.184 (#4588)
1011
* v6.0, 2025-10-21, Merge [#4535](https://github.com/ossrs/srs/issues/4535): Bridge: Fix heap-use-after-free in SrsCompositeBridge iterator. v6.0.183 (#4535)
1112
* v6.0, 2025-10-17, Merge [#4534](https://github.com/ossrs/srs/pull/4534): HLS: Fix a iterator bug in hls_ctx cleanup function. v6.0.182 (#4534)
1213
* v6.0, 2025-10-14, Disable sanitizer by default to fix memory leak. (#4364) v6.0.181

trunk/src/app/srs_app_rtmp_conn.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,11 @@ srs_error_t SrsRtmpConn::handle_publish_message(SrsSharedPtr<SrsLiveSource>& sou
11731173

11741174
// for flash, any packet is republish.
11751175
if (info->type == SrsRtmpConnFlashPublish) {
1176+
if (dynamic_cast<SrsFMLEStartPacket *>(pkt.get())) {
1177+
srs_warn("flash late FMLE start packet");
1178+
return err;
1179+
}
1180+
11761181
// flash unpublish.
11771182
// TODO: maybe need to support republish.
11781183
srs_trace("flash flash publish finished.");

trunk/src/core/srs_core_version6.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 6
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 183
12+
#define VERSION_REVISION 184
1313

1414
#endif

0 commit comments

Comments
 (0)