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

refine autofree, only free object, never free arrays

Browse source
This commit is contained in:
winlin 2014-05-14 09:41:41 +08:00
parent 300f264e92
commit dc66c525fd
17 changed files with 160 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -490,8 +490,8 @@ int SrsRtmpClient::connect_app(string app, string tc_url)
srs_error("expect connect app response message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsConnectAppResPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsConnectAppResPacket, pkt);
srs_info("get connect app response message");
return ret;
@ -517,8 +517,8 @@ int SrsRtmpClient::create_stream(int& stream_id)
srs_error("expect create stream response message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsCreateStreamResPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsCreateStreamResPacket, pkt);
srs_info("get create stream response message");
stream_id = (int)pkt->stream_id;
@ -651,8 +651,8 @@ int SrsRtmpClient::fmle_publish(string stream, int& stream_id)
srs_error("expect create stream response message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsCreateStreamResPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsCreateStreamResPacket, pkt);
srs_info("get create stream response message");
stream_id = (int)pkt->stream_id;
@ -772,8 +772,8 @@ int SrsRtmpServer::connect_app(SrsRequest* req)
srs_error("expect connect app message failed. ret=%d", ret);
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsConnectAppPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsConnectAppPacket, pkt);
srs_info("get connect app message");
SrsAmf0Any* prop = NULL;
@ -922,7 +922,7 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
srs_trace("identify ignore messages except "
@ -936,7 +936,7 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
if (dynamic_cast<SrsCreateStreamPacket*>(pkt)) {
srs_info("identify client by create stream, play or flash publish.");
@ -1128,8 +1128,8 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
}
srs_info("recv FCPublish request message success.");
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsFMLEStartPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsFMLEStartPacket, pkt);
fc_publish_tid = pkt->transaction_id;
}
@ -1154,8 +1154,8 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
}
srs_info("recv createStream request message success.");
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsCreateStreamPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsCreateStreamPacket, pkt);
create_stream_tid = pkt->transaction_id;
}
@ -1179,8 +1179,8 @@ int SrsRtmpServer::start_fmle_publish(int stream_id)
}
srs_info("recv publish request message success.");
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsPublishPacket, pkt, false);
SrsAutoFree(SrsMessage, msg);
SrsAutoFree(SrsPublishPacket, pkt);
}
// publish response onFCPublish(NetStream.Publish.Start)
if (true) {
@ -1310,7 +1310,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
return ret;
}
SrsAutoFree(SrsMessage, msg, false);
SrsAutoFree(SrsMessage, msg);
if (!msg->header.is_amf0_command() && !msg->header.is_amf3_command()) {
srs_trace("identify ignore messages except "
@ -1324,7 +1324,7 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
return ret;
}
SrsAutoFree(SrsPacket, pkt, false);
SrsAutoFree(SrsPacket, pkt);
if (dynamic_cast<SrsPlayPacket*>(pkt)) {
srs_info("level1 identify client by play.");