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 in recv message error, always free msg

Browse source
This commit is contained in:
winlin 2014-05-02 12:44:38 +08:00
parent 52d1fa8df5
commit 5b98a27256
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -454,7 +454,6 @@ int SrsRtmpClient::connect_app(string app, string tc_url)
if (true) { if (true) {
SrsConnectAppPacket* pkt = new SrsConnectAppPacket(); SrsConnectAppPacket* pkt = new SrsConnectAppPacket();
pkt->command_object = SrsAmf0Any::object();
pkt->command_object->set("app", SrsAmf0Any::str(app.c_str())); pkt->command_object->set("app", SrsAmf0Any::str(app.c_str()));
pkt->command_object->set("swfUrl", SrsAmf0Any::str()); pkt->command_object->set("swfUrl", SrsAmf0Any::str());
pkt->command_object->set("tcUrl", SrsAmf0Any::str(tc_url.c_str())); pkt->command_object->set("tcUrl", SrsAmf0Any::str(tc_url.c_str()));

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

@ -382,6 +382,7 @@ int SrsProtocol::recv_message(SrsMessage** pmsg)
if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) { if (ret != ERROR_SOCKET_TIMEOUT && !srs_is_client_gracefully_close(ret)) {
srs_error("recv interlaced message failed. ret=%d", ret); srs_error("recv interlaced message failed. ret=%d", ret);
} }
srs_freep(msg);
return ret; return ret;
} }
srs_verbose("entire msg received"); srs_verbose("entire msg received");

4
trunk/src/rtmp/srs_protocol_rtmp_stack.hpp
View file

@ -477,6 +477,10 @@ protected:
public: public:
std::string command_name; std::string command_name;
double transaction_id; double transaction_id;
/**
* alloc in packet constructor,
* so, directly use it, never alloc again.
*/
SrsAmf0Object* command_object; SrsAmf0Object* command_object;
public: public:
SrsConnectAppPacket(); SrsConnectAppPacket();