From 22e71a39e7c1eaa00a33ed407863cccc70dc63c6 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 14 Oct 2025 20:29:02 -0400 Subject: [PATCH] Disable sanitizer by default to fix memory leak. #4364 --- trunk/Dockerfile.test | 2 +- trunk/auto/options.sh | 4 ++++ trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version6.hpp | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test index aae3f0918..928525e67 100644 --- a/trunk/Dockerfile.test +++ b/trunk/Dockerfile.test @@ -18,7 +18,7 @@ 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 --apm=on --h265=on --utest=on --ffmpeg-opus=off --build-cache=on +RUN ./configure --srt=on --gb28181=on --srt=on --apm=on --h265=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 03d58c54c..b4cb47a22 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -549,6 +549,10 @@ function apply_auto_options() { SRS_SANITIZER=YES fi + if [[ $SRS_SANITIZER == RESERVED && $SRS_UTEST == YES ]]; then + SRS_SANITIZER=YES + fi + # If enable gperf, disable sanitizer. if [[ $SRS_GPERF == YES && $SRS_SANITIZER == YES ]]; then echo "Disable sanitizer for gperf" diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 556240464..a067693e1 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,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 * v6.0, 2025-09-27, For Edge, only support RTMP or HTTP-FLV. v6.0.179 (#4512) * v6.0, 2025-09-20, 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