external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #515, merge from srs2, use SrsAutoFreeA.

Browse source
This commit is contained in:
winlin 2015-11-02 11:29:20 +08:00
parent 604486b0a3
commit f57e537686
14 changed files with 54 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
trunk/src/protocol/srs_rtmp_handshake.cpp
View file

@ -487,7 +487,7 @@ namespace _srs_internal
}
srs_assert(c1_digest != NULL);
SrsAutoFree(char, c1_digest);
SrsAutoFreeA(char, c1_digest);
memcpy(digest.digest, c1_digest, 32);
@ -506,7 +506,7 @@ namespace _srs_internal
}
srs_assert(c1_digest != NULL);
SrsAutoFree(char, c1_digest);
SrsAutoFreeA(char, c1_digest);
is_valid = srs_bytes_equals(digest.digest, c1_digest, 32);
@ -546,7 +546,7 @@ namespace _srs_internal
srs_verbose("calc s1 digest success.");
srs_assert(s1_digest != NULL);
SrsAutoFree(char, s1_digest);
SrsAutoFreeA(char, s1_digest);
memcpy(digest.digest, s1_digest, 32);
srs_verbose("copy s1 key success.");
@ -566,7 +566,7 @@ namespace _srs_internal
}
srs_assert(s1_digest != NULL);
SrsAutoFree(char, s1_digest);
SrsAutoFreeA(char, s1_digest);
is_valid = srs_bytes_equals(digest.digest, s1_digest, 32);
@ -585,7 +585,7 @@ namespace _srs_internal
* @return a new allocated bytes, user must free it.
*/
char* c1s1_joined_bytes = new char[1536 -32];
SrsAutoFree(char, c1s1_joined_bytes);
SrsAutoFreeA(char, c1s1_joined_bytes);
if ((ret = copy_to(owner, c1s1_joined_bytes, 1536 - 32, false)) != ERROR_SUCCESS) {
return ret;
}
@ -613,7 +613,7 @@ namespace _srs_internal
* @return a new allocated bytes, user must free it.
*/
char* c1s1_joined_bytes = new char[1536 -32];
SrsAutoFree(char, c1s1_joined_bytes);
SrsAutoFreeA(char, c1s1_joined_bytes);
if ((ret = copy_to(owner, c1s1_joined_bytes, 1536 - 32, false)) != ERROR_SUCCESS) {
return ret;
}