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

fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95

Browse source
This commit is contained in:
winlin 2014-05-13 14:24:39 +08:00
parent 0a1c0afe8d
commit befde6acf7
15 changed files with 209 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/rtmp/srs_protocol_handshake.cpp
View file

@ -336,10 +336,10 @@ namespace srs
void srs_key_block_free(key_block* key)
{
if (key->random0) {
srs_freepa(key->random0);
srs_freep(key->random0);
}
if (key->random1) {
srs_freepa(key->random1);
srs_freep(key->random1);
}
}
@ -427,10 +427,10 @@ namespace srs
void srs_digest_block_free(digest_block* digest)
{
if (digest->random0) {
srs_freepa(digest->random0);
srs_freep(digest->random0);
}
if (digest->random1) {
srs_freepa(digest->random1);
srs_freep(digest->random1);
}
}

6
trunk/src/rtmp/srs_protocol_rtmp.cpp
View file

@ -192,9 +192,9 @@ SrsHandshakeBytes::SrsHandshakeBytes()
SrsHandshakeBytes::~SrsHandshakeBytes()
{
srs_freepa(c0c1);
srs_freepa(s0s1s2);
srs_freepa(c2);
srs_freep(c0c1);
srs_freep(s0s1s2);
srs_freep(c2);
}
int SrsHandshakeBytes::read_c0c1(ISrsProtocolReaderWriter* io)

8
trunk/src/rtmp/srs_protocol_rtmp_stack.cpp
View file

@ -1538,7 +1538,7 @@ SrsCommonMessage::SrsCommonMessage()
SrsCommonMessage::~SrsCommonMessage()
{
srs_freepa(payload);
srs_freep(payload);
}
SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr()
@ -1550,7 +1550,7 @@ SrsSharedPtrMessage::__SrsSharedPtr::__SrsSharedPtr()
SrsSharedPtrMessage::__SrsSharedPtr::~__SrsSharedPtr()
{
srs_freepa(payload);
srs_freep(payload);
}
SrsSharedPtrMessage::SrsSharedPtrMessage()
@ -1678,14 +1678,14 @@ int SrsPacket::encode(int& psize, char*& ppayload)
if ((ret = stream.initialize(payload, size)) != ERROR_SUCCESS) {
srs_error("initialize the stream failed. ret=%d", ret);
srs_freepa(payload);
srs_freep(payload);
return ret;
}
}
if ((ret = encode_packet(&stream)) != ERROR_SUCCESS) {
srs_error("encode the packet failed. ret=%d", ret);
srs_freepa(payload);
srs_freep(payload);
return ret;
}