fix: unrecognized fmtp parameter caused crash #3162
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
underthere
changed the title
winlinvip
reviewed
Sep 1, 2022
trunk/src/app/srs_app_rtc_sdp.cpp
Outdated
| @@ -59,6 +59,9 @@ srs_error_t srs_parse_h264_fmtp(const std::string& fmtp, H264SpecificParam& h264 | |||
| std::vector<std::string> vec = split_str(fmtp, ";"); | |||
| for (size_t i = 0; i < vec.size(); ++i) { | |||
| std::vector<std::string> kv = split_str(vec[i], "="); | |||
| if( kv.size() >= 2 && kv[0] == "sprop-parameter-sets") { // ignore sprop-parameter-sets | |||
There was a problem hiding this comment.
Why >=2? Should be:
if (!kv.empty() && kv[0] == "sprop-parameter-sets") { // Ignore sprop-parameter-sets
??
winlinvip
reviewed
Sep 1, 2022
trunk/src/app/srs_app_rtc_conn.cpp
Outdated
| @@ -3171,6 +3175,11 @@ srs_error_t SrsRtcConnection::generate_publish_local_sdp(SrsRequest* req, SrsSdp | |||
| } | |||
| } | |||
|
|
|||
| if (local_sdp.media_descs_.empty()){ | |||
| srs_trace("empty media desc!"); | |||
There was a problem hiding this comment.
Please remove this line, because all information is in err, no need to logging here. The error message should be merged to err.
winlinvip
reviewed
Sep 1, 2022
trunk/src/app/srs_app_rtc_conn.cpp
Outdated
| @@ -3131,9 +3131,14 @@ srs_error_t SrsRtcConnection::generate_publish_local_sdp(SrsRequest* req, SrsSdp | |||
| for (int i = 0; i < (int)stream_desc->video_track_descs_.size(); ++i) { | |||
| SrsRtcTrackDescription* video_track = stream_desc->video_track_descs_.at(i); | |||
|
|
|||
| SrsVideoPayload* payload = (SrsVideoPayload*)video_track->media_; | |||
| if (payload == NULL){ | |||
There was a problem hiding this comment.
Should be replaced by:
if (!video_track->media_) break;?
There was a problem hiding this comment.
Thanks for your review!
Is there any coding style guide? Someone likes me may need it.
winlinvip
force-pushed
the
4.0release
branch
from
0126030
to
34196ea
Compare
winlinvip
reviewed
Sep 9, 2022
| @@ -59,6 +59,9 @@ srs_error_t srs_parse_h264_fmtp(const std::string& fmtp, H264SpecificParam& h264 | |||
| std::vector<std::string> vec = split_str(fmtp, ";"); | |||
| for (size_t i = 0; i < vec.size(); ++i) { | |||
| std::vector<std::string> kv = split_str(vec[i], "="); | |||
| if( !kv.empty() && kv[0] == "sprop-parameter-sets") { // ignore sprop-parameter-sets | |||
There was a problem hiding this comment.
A better approach is to ignore the ones that are not recognized and only focus on checking if the required parameters meet the requirements.
However, I am still very grateful for the submitted PR. 👍
TRANS_BY_GPT3
underthere
deleted the
bugfix/parse-rtc-sdp-fmtp-unrecognized-parameter-caused-crash
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please describe the summary for this PR.
relative issue: #3093