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

Cover shared ptr message.

Browse source
This commit is contained in:
winlin 2019-05-20 08:45:42 +08:00
parent 9cdd506b4f
commit dd4ccfab79
3 changed files with 48 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -175,6 +175,7 @@
#define ERROR_OpenSslCreateHMAC 2050 #define ERROR_OpenSslCreateHMAC 2050
#define ERROR_RTMP_STREAM_NAME_EMPTY 2051 #define ERROR_RTMP_STREAM_NAME_EMPTY 2051
#define ERROR_HTTP_HIJACK 2052 #define ERROR_HTTP_HIJACK 2052
#define ERROR_RTMP_MESSAGE_CREATE 2053
// //
// The system control message, // The system control message,
// It's not an error, but special control logic. // It's not an error, but special control logic.

10
trunk/src/kernel/srs_kernel_flv.cpp
View file

@ -250,12 +250,12 @@ srs_error_t SrsSharedPtrMessage::create(SrsCommonMessage* msg)
srs_error_t SrsSharedPtrMessage::create(SrsMessageHeader* pheader, char* payload, int size) srs_error_t SrsSharedPtrMessage::create(SrsMessageHeader* pheader, char* payload, int size)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
if (ptr) { if (size < 0) {
srs_assert(false); return srs_error_new(ERROR_RTMP_MESSAGE_CREATE, "create message size=%d", size);
return srs_error_new(ERROR_SYSTEM_ASSERT_FAILED, "should not set the payload twice");
} }
srs_assert(!ptr);
ptr = new SrsSharedPtrPayload(); ptr = new SrsSharedPtrPayload();
// direct attach the data. // direct attach the data.

42
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -3467,6 +3467,48 @@ VOID TEST(KernelFLVTest, CoverAll)
#endif #endif
} }
VOID TEST(KernelFLVTest, CoverSharedPtrMessage)
{
srs_error_t err;
if (true) {
SrsMessageHeader h;
SrsSharedPtrMessage m;
HELPER_EXPECT_SUCCESS(m.create(&h, new char[1], 1));
}
if (true) {
SrsMessageHeader h;
SrsSharedPtrMessage m;
HELPER_EXPECT_SUCCESS(m.create(&h, NULL, 0));
}
if (true) {
SrsMessageHeader h;
SrsSharedPtrMessage m;
HELPER_EXPECT_FAILED(m.create(&h, NULL, -1));
}
if (true) {
SrsCommonMessage cm;
cm.size = -1;
SrsSharedPtrMessage m;
HELPER_EXPECT_FAILED(m.create(&cm));
}
if (true) {
SrsMessageHeader h;
h.perfer_cid = 1;
SrsSharedPtrMessage m;
HELPER_EXPECT_SUCCESS(m.create(&h, NULL, 0));
EXPECT_FALSE(m.check(1));
EXPECT_TRUE(m.check(1));
}
}
VOID TEST(KernelLogTest, CoverAll) VOID TEST(KernelLogTest, CoverAll)
{ {
if (true) { if (true) {