Fix RTP header buffer read #2411
Merged
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
|
Thanks for your contribution, @isnumanagic! Please make sure you sign our CLA, as it's a required step before we can merge this. |
lminiero
reviewed
Oct 28, 2020
postprocessing/janus-pp-rec.c
Outdated
| @@ -727,13 +727,31 @@ int main(int argc, char *argv[]) | |||
| JANUS_LOG(LOG_VERB, " -- -- Skipping CSRC list\n"); | |||
| skip += rtp->csrccount*4; | |||
| } | |||
| if (rtp->csrccount || rtp->extension) { | |||
There was a problem hiding this comment.
Code style: no space between if and ( (there's a few occurrences of this).
postprocessing/janus-pp-rec.c
Outdated
| JANUS_LOG(LOG_WARN, "Missing RTP packet header data (%d instead %"SCNu16")\n", | ||
| rtp_header_len+bytes, rtp_header_len+rtp_read_n); | ||
| break; | ||
| } else |
There was a problem hiding this comment.
Code style: the other condition of the else also should have a bracket, even of the action is simple (makes the code more readable and less ambiguous).
|
Thanks for the quick fixes! I'll make a few tests with existing recordings, and if everything goes well I'll merge 👍 |
|
Looks good, merging, thanks again 👍 |
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.
This PR fixes short RTP header buffer in postprocessing module.
Currently, only first 24 bytes of RTP packet are read into buffer, which can omit some/all extension header data, or, in worse case, cause extension header corruption (which is how I found this bug). This fix reads in remaining header bytes into buffer after reading csrc count and extension header length.