From b0d16840b5e5ad99a473a6e8b2165b35e0676c56 Mon Sep 17 00:00:00 2001 From: ljx0305 Date: Sat, 25 Feb 2017 11:15:27 +0800 Subject: [PATCH 1/2] fix Repeated release (#783) fix Repeated release --- trunk/src/app/srs_app_source.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 6657b0adc..a8e280db9 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1881,7 +1881,6 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) } else { ret = on_video_imp(m); } - srs_freep(m); return ret; } From 0059b1cf7aaab8261cfe4ca79779043fcc7df604 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Feb 2017 11:18:54 +0800 Subject: [PATCH 2/2] For #783, use directly free to replace auto free --- trunk/conf/origin.conf | 1 + trunk/src/app/srs_app_source.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/conf/origin.conf b/trunk/conf/origin.conf index 287d4e98e..f27abb0ad 100644 --- a/trunk/conf/origin.conf +++ b/trunk/conf/origin.conf @@ -6,5 +6,6 @@ listen 19350; max_connections 1000; daemon off; srs_log_tank console; +pid ./objs/origin.pid; vhost __defaultVhost__ { } diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index a8e280db9..8b26dd72d 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1873,7 +1873,6 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) if (!m) { return ret; } - SrsAutoFree(SrsSharedPtrMessage, m); // consume the monotonically increase message. if (m->is_audio()) { @@ -1881,6 +1880,7 @@ int SrsSource::on_video(SrsCommonMessage* shared_video) } else { ret = on_video_imp(m); } + srs_freep(m); return ret; }