Committed by
GitHub
Merge pull request #330 from xubin11235/2.0release
修复forward崩溃
正在显示
2 个修改的文件
包含
1 行增加
和
2 行删除
trunk/src/app/srs_app_forward.cpp
100644 → 100755
| @@ -68,8 +68,6 @@ SrsForwarder::SrsForwarder(SrsSource* _source) | @@ -68,8 +68,6 @@ SrsForwarder::SrsForwarder(SrsSource* _source) | ||
| 68 | 68 | ||
| 69 | SrsForwarder::~SrsForwarder() | 69 | SrsForwarder::~SrsForwarder() |
| 70 | { | 70 | { |
| 71 | - on_unpublish(); | ||
| 72 | - | ||
| 73 | srs_freep(pthread); | 71 | srs_freep(pthread); |
| 74 | srs_freep(queue); | 72 | srs_freep(queue); |
| 75 | srs_freep(jitter); | 73 | srs_freep(jitter); |
trunk/src/app/srs_app_st.cpp
100644 → 100755
| @@ -237,6 +237,7 @@ void srs_close_stfd(st_netfd_t& stfd) | @@ -237,6 +237,7 @@ void srs_close_stfd(st_netfd_t& stfd) | ||
| 237 | // we must ensure the close is ok. | 237 | // we must ensure the close is ok. |
| 238 | int err = st_netfd_close(stfd); | 238 | int err = st_netfd_close(stfd); |
| 239 | srs_assert(err != -1); | 239 | srs_assert(err != -1); |
| 240 | + stfd = NULL; | ||
| 240 | } | 241 | } |
| 241 | } | 242 | } |
| 242 | 243 |
-
请 注册 或 登录 后发表评论