From bd0963c6e109fe9a80c84ff7ee22d9c9e46faa5d Mon Sep 17 00:00:00 2001 From: yashwardhan-jyani Date: Wed, 22 Mar 2023 17:32:58 +0530 Subject: [PATCH 1/2] remove null-pointer-check --- trunk/src/core/srs_core.hpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 5bb332d5cc..9aaa0ded83 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -44,17 +44,13 @@ // To free the p and set to NULL. // @remark The p must be a pointer T*. #define srs_freep(p) \ - if (p) { \ - delete p; \ - p = NULL; \ - } \ + delete p; \ + p = NULL; \ (void)0 // Please use the freepa(T[]) to free an array, otherwise the behavior is undefined. #define srs_freepa(pa) \ - if (pa) { \ - delete[] pa; \ - pa = NULL; \ - } \ + delete[] pa; \ + pa = NULL; \ (void)0 // Check CPU for ST(state-threads), please read https://github.com/ossrs/state-threads/issues/22 From 60afb353c203a6ea8ee18ab0439129db5fbc25f8 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 25 Mar 2023 09:40:56 +0800 Subject: [PATCH 2/2] Update release to v5.0.149, v6.0.37 --- trunk/doc/CHANGELOG.md | 2 ++ trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/core/srs_core_version6.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index b292047727..15f4935ada 100644 --- 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-03-25, Merge [#3477](https://github.com/ossrs/srs/pull/3477): Remove unneccessary NULL check in srs_freep. v6.0.37 (#3477) * v6.0, 2023-03-22, Merge [#3427](https://github.com/ossrs/srs/pull/3427): WHIP: Support DELETE resource for Larix Broadcaster. v6.0.36 (#3427) * v6.0, 2023-03-20, Merge [#3460](https://github.com/ossrs/srs/pull/3460): WebRTC: Support WHIP/WHEP players. v6.0.35 (#3460) * v6.0, 2023-03-07, Merge [#3441](https://github.com/ossrs/srs/pull/3441): HEVC: webrtc support hevc on safari. v6.0.34 (#3441) @@ -50,6 +51,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-03-25, Merge [#3477](https://github.com/ossrs/srs/pull/3477): Remove unneccessary NULL check in srs_freep. v5.0.149 (#3477) * v5.0, 2023-03-22, Merge [#3427](https://github.com/ossrs/srs/pull/3427): WHIP: Support DELETE resource for Larix Broadcaster. v5.0.148 (#3427) * v5.0, 2023-03-20, Merge [#3460](https://github.com/ossrs/srs/pull/3460): WebRTC: Support WHIP/WHEP players. v5.0.147 (#3460) * v5.0, 2023-03-07, Merge [#3446](https://github.com/ossrs/srs/pull/3446): WebRTC: Warning if no ideal profile. v5.0.146 (#3446) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 08eb4da339..4f2e819dd1 100644 --- 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 148 +#define VERSION_REVISION 149 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index f8355215fd..2c638b46b0 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 36 +#define VERSION_REVISION 37 #endif