Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix security scan problems. v6.0.131 #4100

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Fix security scan problems. v6.0.131 #4100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a97415
fix redundant null check.
suzp1984 Jun 21, 2024
7044897
cheating the security scanning
suzp1984 Jun 21, 2024
9cbcfbd
Update release to v6.0.131
winlinvip Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions trunk/doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v6-changes"></a>

## SRS 6.0 Changelog
* v6.0, 2024-06-21, Merge [#4100](https://github.com/ossrs/srs/pull/4100): Fix security scan problems. v6.0.131 (#4100)
* v6.0, 2024-06-21, Merge [#4097](https://github.com/ossrs/srs/pull/4097): SmartPtr: Support load test for source by srs-bench. v6.0.130 (#4097)
* v6.0, 2024-06-15, Merge [#4089](https://github.com/ossrs/srs/pull/4089): SmartPtr: Support shared ptr for live source. v6.0.129 (#4089)
* v6.0, 2024-06-14, Merge [#4085](https://github.com/ossrs/srs/pull/4085): SmartPtr: Support shared ptr for RTC source. v6.0.128 (#4085)
Expand Down
8 changes: 3 additions & 5 deletions trunk/src/app/srs_app_http_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,11 +1204,9 @@ srs_error_t SrsHttpStreamServer::hijack(ISrsHttpMessage* request, ISrsHttpHandle
}

// use the handler if exists.
if (ph) {
if (streamHandlers.find(sid) != streamHandlers.end()) {
entry = streamHandlers[sid];
*ph = entry->stream;
}
if (streamHandlers.find(sid) != streamHandlers.end()) {
entry = streamHandlers[sid];
*ph = entry->stream;
}

// trigger edge to fetch from origin.
Expand Down
8 changes: 4 additions & 4 deletions trunk/src/app/srs_app_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@ void SrsFastVector::push_back(SrsSharedPtrMessage* msg)
// increase vector.
if (count >= nb_msgs) {
int size = srs_max(SRS_PERF_MW_MSGS * 8, nb_msgs * 2);
SrsSharedPtrMessage** buf = new SrsSharedPtrMessage*[size];
SrsSharedPtrMessage** buf = msgs;
msgs = new SrsSharedPtrMessage*[size];
for (int i = 0; i < nb_msgs; i++) {
buf[i] = msgs[i];
msgs[i] = buf[i];
}
srs_info("fast vector incrase %d=>%d", nb_msgs, size);

// use new array.
srs_freepa(msgs);
msgs = buf;
srs_freepa(buf);
nb_msgs = size;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 130
#define VERSION_REVISION 131

#endif
Loading