Fixed crash in craftKmResponse due to CryptoControl being NULL #2277
+53
−63
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
maxsharabayko
added
Type: Bug
ethouris
reviewed
Apr 11, 2022
| size_t exp_len = | ||
| CHandShake::m_iContentSize; // When CHandShake::m_iContentSize is used in log, the file fails to link! | ||
| // When CHandShake::m_iContentSize is used in log, the file fails to link! | ||
| size_t exp_len = CHandShake::m_iContentSize; |
There was a problem hiding this comment.
This can be fixed easier - in 10772 use +CHandShake::m_iContentSize instead of exp_len.
There was a problem hiding this comment.
As I can see, you wrote that exactly this (using the CHandShake::m_iContentSize in log) fails to link.
There was a problem hiding this comment.
You missed the + before the name. This is exactly what fixes the problem.
ethouris
reviewed
Apr 11, 2022
| @@ -3908,6 +3908,14 @@ EConnectStatus srt::CUDT::craftKmResponse(uint32_t* aw_kmdata, size_t& w_kmdatas | |||
| int hs_flags = SrtHSRequest::SRT_HSTYPE_HSFLAGS::unwrap(m_ConnRes.m_iType); | |||
| if (IsSet(hs_flags, CHandShake::HS_EXT_KMREQ)) | |||
| { | |||
| if (!m_pCryptoControl) | |||
There was a problem hiding this comment.
This lacks an explanation as to why this fixes the problem. This function should at best have:
- The declarations of all mutexes that are locked before calling this function and made sure that the list is stable against all places from which this function is called
- In all places that can modify
m_pCryptoControlmake sure that locking on that place can exclude the possibility of modifying this field anywhere up to the end of this function (mention these places here)
ethouris
reviewed
Apr 11, 2022
ethouris
reviewed
Apr 11, 2022
ethouris
reviewed
Apr 11, 2022
ethouris
reviewed
Apr 11, 2022
ethouris
reviewed
Apr 11, 2022
Update listener write-ready only after the new connection. Was changed in Haivision#1650, but must not be done at all (see Haivision#1831).
maxsharabayko
force-pushed
the
hotfix/craftkm-crash
branch
from
ea289a4 to
ceeeca5
Compare
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.
CryptoControlexists incraftKmResponse(..). Fixes [BUG] Crash in srt::CUDT::craftKmResponse from a null pointer in m_pCryptoControl #2231.CUDT::processConnectRequest(..)function.