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

merge srs2, use srs_freepa for array

Browse source
This commit is contained in:
winlin 2015-11-02 11:05:39 +08:00
parent cef1ae5a8e
commit 8cec06e898
16 changed files with 69 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/protocol/srs_http_stack.cpp
View file

@ -768,7 +768,7 @@ ISrsHttpMessage::ISrsHttpMessage()
ISrsHttpMessage::~ISrsHttpMessage()
{
srs_freep(_http_ts_send_buffer);
srs_freepa(_http_ts_send_buffer);
}
char* ISrsHttpMessage::http_ts_send_buffer()

2
trunk/src/protocol/srs_protocol_utility.cpp
View file

@ -222,7 +222,7 @@ int srs_rtmp_create_msg(char type, u_int32_t timestamp, char* data, int size, in
// only when failed, we must free the data.
if ((ret = srs_do_rtmp_create_msg(type, timestamp, data, size, stream_id, ppmsg)) != ERROR_SUCCESS) {
srs_freep(data);
srs_freepa(data);
return ret;
}

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

@ -319,8 +319,8 @@ namespace _srs_internal
key_block::~key_block()
{
srs_freep(random0);
srs_freep(random1);
srs_freepa(random0);
srs_freepa(random1);
}
int key_block::parse(SrsBuffer* stream)
@ -342,7 +342,7 @@ namespace _srs_internal
random0_size = valid_offset;
if (random0_size > 0) {
srs_freep(random0);
srs_freepa(random0);
random0 = new char[random0_size];
stream->read_bytes(random0, random0_size);
}
@ -351,7 +351,7 @@ namespace _srs_internal
random1_size = 764 - valid_offset - 128 - 4;
if (random1_size > 0) {
srs_freep(random1);
srs_freepa(random1);
random1 = new char[random1_size];
stream->read_bytes(random1, random1_size);
}
@ -401,8 +401,8 @@ namespace _srs_internal
digest_block::~digest_block()
{
srs_freep(random0);
srs_freep(random1);
srs_freepa(random0);
srs_freepa(random1);
}
int digest_block::parse(SrsBuffer* stream)
@ -419,7 +419,7 @@ namespace _srs_internal
random0_size = valid_offset;
if (random0_size > 0) {
srs_freep(random0);
srs_freepa(random0);
random0 = new char[random0_size];
stream->read_bytes(random0, random0_size);
}
@ -428,7 +428,7 @@ namespace _srs_internal
random1_size = 764 - 4 - valid_offset - 32;
if (random1_size > 0) {
srs_freep(random1);
srs_freepa(random1);
random1 = new char[random1_size];
stream->read_bytes(random1, random1_size);
}
@ -592,7 +592,7 @@ namespace _srs_internal
c1_digest = new char[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFPKey, 30, c1s1_joined_bytes, 1536 - 32, c1_digest)) != ERROR_SUCCESS) {
srs_freep(c1_digest);
srs_freepa(c1_digest);
srs_error("calc digest for c1 failed. ret=%d", ret);
return ret;
}
@ -620,7 +620,7 @@ namespace _srs_internal
s1_digest = new char[SRS_OpensslHashSize];
if ((ret = openssl_HMACsha256(SrsGenuineFMSKey, 36, c1s1_joined_bytes, 1536 - 32, s1_digest)) != ERROR_SUCCESS) {
srs_freep(s1_digest);
srs_freepa(s1_digest);
srs_error("calc digest for s1 failed. ret=%d", ret);
return ret;
}

2
trunk/src/protocol/srs_rtmp_msg_array.cpp
View file

@ -40,7 +40,7 @@ SrsMessageArray::~SrsMessageArray()
// we just free the msgs itself,
// both delete and delete[] is ok,
// for each msg in msgs is already freed by send_and_free_messages.
srs_freep(msgs);
srs_freepa(msgs);
}
void SrsMessageArray::free(int count)

14
trunk/src/protocol/srs_rtmp_stack.cpp
View file

@ -151,14 +151,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_freep(payload);
srs_freepa(payload);
return ret;
}
}
if ((ret = encode_packet(&stream)) != ERROR_SUCCESS) {
srs_error("encode the packet failed. ret=%d", ret);
srs_freep(payload);
srs_freepa(payload);
return ret;
}
@ -279,7 +279,7 @@ SrsProtocol::~SrsProtocol()
SrsChunkStream* cs = cs_cache[i];
srs_freep(cs);
}
srs_freep(cs_cache);
srs_freepa(cs_cache);
}
void SrsProtocol::set_auto_response(bool v)
@ -632,7 +632,7 @@ int SrsProtocol::do_send_and_free_packet(SrsPacket* packet, int stream_id)
header.perfer_cid = packet->get_prefer_cid();
ret = do_simple_send(&header, payload, size);
srs_freep(payload);
srs_freepa(payload);
if (ret == ERROR_SUCCESS) {
ret = on_send_packet(&header, packet);
}
@ -1776,9 +1776,9 @@ SrsHandshakeBytes::SrsHandshakeBytes()
SrsHandshakeBytes::~SrsHandshakeBytes()
{
srs_freep(c0c1);
srs_freep(s0s1s2);
srs_freep(c2);
srs_freepa(c0c1);
srs_freepa(s0s1s2);
srs_freepa(c2);
}
int SrsHandshakeBytes::read_c0c1(ISrsProtocolReaderWriter* io)