SRT: fix crash when srt_to_rtmp off (#3386)

xiaozhihong · chundonglinlin · web-flow · commit c5ccee1edf85 · 2023-01-18T08:52:26.000+08:00
* SRT: fix crash when srt_to_rtmp off
* Release v5.0.136 v6.0.17

Co-authored-by: chundonglinlin &lt;chundonglinlin@163.com&gt;
diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -8,6 +8,7 @@ The changelog for SRS.
 
 ## SRS 6.0 Changelog
 
+* v6.0, 2023-01-18, Merge [#3386](https://github.com/ossrs/srs/pull/3386): SRT: fix crash when srt_to_rtmp off. v6.0.17 (#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. v6.0.16 (#3385)
 * v6.0, 2023-01-17, Merge [#3379](https://github.com/ossrs/srs/pull/3379): H265: Support demux vps/pps info. v6.0.15
 * v6.0, 2023-01-08, Merge [#3360](https://github.com/ossrs/srs/pull/3360): H265: Support DVR HEVC stream to MP4. v6.0.14
@@ -30,6 +31,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
diff --git a/trunk/src/app/srs_app_srt_source.cpp b/trunk/src/app/srs_app_srt_source.cpp
@@ -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;
 
-    bridge_->on_unpublish();
+    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");
     }
 
diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    135
+#define VERSION_REVISION    136
 
 #endif
diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    16
+#define VERSION_REVISION    17
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -768,7 +768,7 @@ srs_error_t SrsSrtSource::on_publish()`
`768`	`768`	`return srs_error_wrap(err, "source id change");`
`769`	`769`	`}`
`770`	`770`
`771`		`- if ((err = bridge_->on_publish()) != srs_success) {`
	`771`	`+ if (bridge_ && (err = bridge_->on_publish()) != srs_success) {`
`772`	`772`	`return srs_error_wrap(err, "bridge on publish");`
`773`	`773`	`}`
`774`	`774`
`@@ -787,7 +787,9 @@ void SrsSrtSource::on_unpublish()`
`787`	`787`
`788`	`788`	`can_publish_ = true;`
`789`	`789`
`790`		`- bridge_->on_unpublish();`
	`790`	`+ if (bridge_) {`
	`791`	`+ bridge_->on_unpublish();`
	`792`	`+ }`
`791`	`793`	`srs_freep(bridge_);`
`792`	`794`	`}`
`793`	`795`
`@@ -802,7 +804,7 @@ srs_error_t SrsSrtSource::on_packet(SrsSrtPacket* packet)`
`802`	`804`	`}`
`803`	`805`	`}`
`804`	`806`
`805`		`- if ((err = bridge_->on_packet(packet)) != srs_success) {`
	`807`	`+ if (bridge_ && (err = bridge_->on_packet(packet)) != srs_success) {`
`806`	`808`	`return srs_error_wrap(err, "bridge consume message");`
`807`	`809`	`}`
`808`	`810`