external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

SRT: fix crash when srt_to_rtmp off (#3386)

Browse source 
* SRT: fix crash when srt_to_rtmp off
* Release v5.0.136 v6.0.17

PICK c5ccee1edf

Co-authored-by: chundonglinlin <chundonglinlin@163.com>
This commit is contained in:
john 2023-01-18 08:52:26 +08:00 committed by winlin
parent be8b1b94a6
commit 4a31b2ea1f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -8,6 +8,7 @@ The changelog for SRS.
## SRS 5.0 Changelog
* v5.0, 2023-01-18, Merge [#3386](https://github.com/ossrs/srs/pull/3386): SRT: fix crash when srt_to_rtmp off. v5.0.136 (#3386)
* v5.0, 2023-01-17, Merge [#3385](https://github.com/ossrs/srs/pull/3385): API: Support server/pid/service label for exporter and api. v5.0.135 (#3385)
* v5.0, 2023-01-17, Merge [#3383](https://github.com/ossrs/srs/pull/3383): GB: Fix PSM parsing indicator bug. v5.0.134 (#3383)
* v5.0, 2023-01-08, Merge [#3308](https://github.com/ossrs/srs/pull/3308): DVR: Improve file write performance by fwrite with cache. v5.0.133

6
trunk/src/app/srs_app_srt_source.cpp
View file

@ -768,7 +768,7 @@ srs_error_t SrsSrtSource::on_publish()
return srs_error_wrap(err, "source id change");
}
if ((err = bridge_->on_publish()) != srs_success) {
if (bridge_ && (err = bridge_->on_publish()) != srs_success) {
return srs_error_wrap(err, "bridge on publish");
}
@ -787,7 +787,9 @@ void SrsSrtSource::on_unpublish()
can_publish_ = true;
if (bridge_) {
bridge_->on_unpublish();
}
srs_freep(bridge_);
}
@ -802,7 +804,7 @@ srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)
}
}
if ((err = bridge_->on_packet(packet)) != srs_success) {
if (bridge_ && (err = bridge_->on_packet(packet)) != srs_success) {
return srs_error_wrap(err, "bridge consume message");
}

2
trunk/src/core/srs_core_version5.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 0
#define VERSION_REVISION 135
#define VERSION_REVISION 136
#endif