diff --git a/trunk/Dockerfile.cov b/trunk/Dockerfile.cov index 0e33e1307..ec99827e8 100644 --- a/trunk/Dockerfile.cov +++ b/trunk/Dockerfile.cov @@ -16,6 +16,7 @@ COPY . /srs WORKDIR /srs/trunk # Note that we must enable the gcc7 or link failed. +# Enable sanitizer explicitly for coverage testing to catch memory issues. RUN ./configure --rtsp=on --srt=on --gb28181=on --apm=on --h265=on --utest=on --gcov=on --sanitizer=on RUN make utest ${MAKEARGS} diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test index 4b10ffad1..5e36b1d75 100644 --- a/trunk/Dockerfile.test +++ b/trunk/Dockerfile.test @@ -18,7 +18,8 @@ WORKDIR /srs/trunk # Note that we must enable the gcc7 or link failed. # Please note that we must disable the ffmpeg-opus, as it negatively impacts performance. We may consider # enabling it in the future when support for multi-threading transcoding is available. -RUN ./configure --srt=on --gb28181=on --srt=on --rtsp=on --apm=on --utest=on --ffmpeg-opus=off --build-cache=on +# Enable sanitizer explicitly for CI/CD testing to catch memory issues. +RUN ./configure --srt=on --gb28181=on --srt=on --rtsp=on --apm=on --utest=on --sanitizer=on --ffmpeg-opus=off --build-cache=on RUN make utest ${MAKEARGS} # Build benchmark tool. diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 5e0baa71c..5b67a829e 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -552,10 +552,11 @@ function apply_auto_options() { SRS_SHARED_SRTP=YES fi - # Enable asan, but disable for Centos + # Disable sanitizer by default to avoid issues with daemon mode. + # Enable sanitizer only for utest and when explicitly requested. # @see https://github.com/ossrs/srs/issues/3347 - if [[ $SRS_SANITIZER == RESERVED && $OS_IS_CENTOS != YES ]]; then - echo "Enable asan by auto options." + if [[ $SRS_SANITIZER == RESERVED && $SRS_UTEST == YES ]]; then + echo "Enable asan for utest." SRS_SANITIZER=YES fi diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index e18bb949d..5233bccdd 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 7.0 Changelog +* v7.0, 2025-10-14, Disable sanitizer by default to fix memory leak. (#4364) v7.0.96 * v7.0, 2025-10-01, SRT: Support configurable default_streamid option. v7.0.95 (#4515) * v7.0, 2025-09-27, Merge [#4513](https://github.com/ossrs/srs/pull/4513): For Edge, only support RTMP or HTTP-FLV. v7.0.94 (#4513) * v7.0, 2025-09-21, Merge [#4505](https://github.com/ossrs/srs/pull/4505): improve blackbox test for rtsp. v7.0.93 (#4505) @@ -109,6 +110,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2025-10-14, Disable sanitizer by default to fix memory leak. (#4364) v6.0.181 * v6.0, 2025-10-01, SRT: Support configurable default_streamid option. v6.0.180 (#4515) * v6.0, 2025-09-27, For Edge, only support RTMP or HTTP-FLV. v6.0.179 (#4512) * v6.0, 2025-09-21, Fix WHIP with transcoding bug. v6.0.178 (#4495) diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index ebe08aa2f..da7917013 100644 --- 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 180 +#define VERSION_REVISION 181 #endif diff --git a/trunk/src/core/srs_core_version7.hpp b/trunk/src/core/srs_core_version7.hpp index 0f3bcaa57..628d9d10c 100644 --- a/trunk/src/core/srs_core_version7.hpp +++ b/trunk/src/core/srs_core_version7.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 7 #define VERSION_MINOR 0 -#define VERSION_REVISION 95 +#define VERSION_REVISION 96 #endif \ No newline at end of file