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

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

@ -1312,7 +1312,7 @@ int SrsKafkaProtocol::send_and_free_message(SrsKafkaRequest* msg)
// TODO: FIXME: refine for performance issue.
char* bytes = new char[size];
SrsAutoFree(char, bytes);
SrsAutoFreeA(char, bytes);
// TODO: FIXME: refine for performance issue.
SrsBuffer* buf = new SrsBuffer();

4
trunk/src/protocol/srs_raw_avc.cpp
View file

@ -157,7 +157,7 @@ int SrsRawH264Stream::mux_sequence_header(string sps, string pps, u_int32_t dts,
+ 3 + (int)sps.length()
+ 3 + (int)pps.length();
char* packet = new char[nb_packet];
SrsAutoFree(char, packet);
SrsAutoFreeA(char, packet);
// use stream to generate the h264 packet.
SrsBuffer stream;
@ -236,7 +236,7 @@ int SrsRawH264Stream::mux_ipb_frame(char* frame, int nb_frame, string& ibp)
// NALUnit
int nb_packet = 4 + nb_frame;
char* packet = new char[nb_packet];
SrsAutoFree(char, packet);
SrsAutoFreeA(char, packet);
// use stream to generate the h264 packet.
SrsBuffer stream;

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;
}

4
trunk/src/protocol/srs_rtsp_stack.cpp
View file

@ -548,7 +548,7 @@ int SrsRtspSdp::parse_fmtp_attribute(string attr)
}
char* tmp_sh = new char[item_value.length()];
SrsAutoFree(char, tmp_sh);
SrsAutoFreeA(char, tmp_sh);
int nb_tmp_sh = ff_hex_to_data((u_int8_t*)tmp_sh, item_value.c_str());
srs_assert(nb_tmp_sh > 0);
audio_sh.append(tmp_sh, nb_tmp_sh);
@ -603,7 +603,7 @@ string SrsRtspSdp::base64_decode(string value)
int nb_output = (int)(value.length() * 2);
u_int8_t* output = new u_int8_t[nb_output];
SrsAutoFree(u_int8_t, output);
SrsAutoFreeA(u_int8_t, output);
int ret = srs_av_base64_decode(output, (char*)value.c_str(), nb_output);
if (ret <= 0) {