Skip to content

Commit 939f6b4

Browse files
winlinvipwinlinvip
committed
HLS: Ignore empty NALU to avoid error. v5.0.170
1 parent 08147f8 commit 939f6b4

8 files changed

+116
-3
lines changed

‎trunk/configure

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ if [[ $SRS_UTEST == YES ]]; then
435435
MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_kernel" "srs_utest_core"
436436
"srs_utest_config" "srs_utest_rtmp" "srs_utest_http" "srs_utest_avc" "srs_utest_reload"
437437
"srs_utest_mp4" "srs_utest_service" "srs_utest_app" "srs_utest_rtc"
438-
"srs_utest_protocol" "srs_utest_protocol2")
438+
"srs_utest_protocol" "srs_utest_protocol2" "srs_utest_kernel2")
439439
if [[ $SRS_SRT == YES ]]; then
440440
MODULE_FILES+=("srs_utest_srt")
441441
fi

‎trunk/doc/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v5-changes"></a>
88

99
## SRS 5.0 Changelog
10+
* v5.0, 2023-08-02, HLS: Ignore empty NALU to avoid error. v5.0.170
1011
* v5.0, 2023-07-26, Merge [#3699](https://github.com/ossrs/srs/pull/3699): Bugfix: Eliminate the redundant declaration of the _srs_rtc_manager variable.. v5.0.168 (#3699)
1112
* v5.0, 2023-07-21, Merge [#3695](https://github.com/ossrs/srs/pull/3695): API: Fix HTTPS callback issue using SNI in TLS client handshake. v5.0.168 (#3695)
1213
* v5.0, 2023-07-18, Merge [#3515](https://github.com/ossrs/srs/pull/3515): WebRTC: Support config the bitrate of transcoding AAC to Opus. v5.0.167 (#3515)

‎trunk/src/core/srs_core_version4.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 4
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 270
12+
#define VERSION_REVISION 271
1313

1414
#endif

‎trunk/src/core/srs_core_version5.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 5
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 169
12+
#define VERSION_REVISION 170
1313

1414
#endif

‎trunk/src/kernel/srs_kernel_codec.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,8 @@ srs_error_t SrsVideoFrame::add_sample(char* bytes, int size)
599599
if ((err = SrsFrame::add_sample(bytes, size)) != srs_success) {
600600
return srs_error_wrap(err, "add frame");
601601
}
602+
603+
if (!bytes || size <= 0) return err;
602604

603605
// for video, parse the nalu type, set the IDR flag.
604606
SrsAvcNaluType nal_unit_type = (SrsAvcNaluType)(bytes[0] & 0x1f);

‎trunk/src/utest/srs_utest.cpp

+39
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
#include <string>
1818
using namespace std;
1919

20+
#include <sys/types.h>
21+
#include <sys/mman.h>
22+
2023
#ifdef SRS_SRT
2124
#include <srs_app_srt_server.hpp>
2225
#endif
@@ -208,3 +211,39 @@ VOID TEST(SampleTest, ContextTest)
208211
cache[0] = cid;
209212
}
210213

214+
MockProtectedBuffer::MockProtectedBuffer() : size_(0), data_(NULL), raw_memory_(NULL)
215+
{
216+
}
217+
218+
MockProtectedBuffer::~MockProtectedBuffer()
219+
{
220+
if (size_ && raw_memory_) {
221+
long page_size = sysconf(_SC_PAGESIZE);
222+
munmap(raw_memory_, page_size * 2);
223+
}
224+
}
225+
226+
int MockProtectedBuffer::alloc(int size)
227+
{
228+
srs_assert(!raw_memory_);
229+
230+
long page_size = sysconf(_SC_PAGESIZE);
231+
if (size >= page_size) return -1;
232+
233+
char* data = (char*)mmap(NULL, page_size * 2, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
234+
if (data == MAP_FAILED) {
235+
return -1;
236+
}
237+
238+
size_ = size;
239+
raw_memory_ = data;
240+
data_ = data + page_size - size;
241+
242+
int r0 = mprotect(data + page_size, page_size, PROT_NONE);
243+
if (r0 < 0) {
244+
return r0;
245+
}
246+
247+
return 0;
248+
}
249+

‎trunk/src/utest/srs_utest.hpp

+27
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,32 @@ class MockEmptyLog : public SrsFileLog
9595
virtual ~MockEmptyLog();
9696
};
9797

98+
// To test the memory corruption, we protect the memory by mprotect.
99+
// MockProtectedBuffer buffer;
100+
// if (buffer.alloc(8)) { EXPECT_TRUE(false); return; }
101+
// Crash when write beyond the data:
102+
// buffer.data_[0] = 0; // OK
103+
// buffer.data_[7] = 0; // OK
104+
// buffer.data_[8] = 0; // Crash
105+
// Crash when read beyond the data:
106+
// char v = buffer.data_[0]; // OK
107+
// char v = buffer.data_[7]; // OK
108+
// char v = buffer.data_[8]; // Crash
109+
// @remark The size of memory to allocate, should smaller than page size, generally 4096 bytes.
110+
class MockProtectedBuffer
111+
{
112+
private:
113+
char* raw_memory_;
114+
public:
115+
int size_;
116+
// Should use this as data.
117+
char* data_;
118+
public:
119+
MockProtectedBuffer();
120+
virtual ~MockProtectedBuffer();
121+
// Return 0 for success.
122+
int alloc(int size);
123+
};
124+
98125
#endif
99126

‎trunk/src/utest/srs_utest_kernel2.cpp

+44
Original file line numberDiff line numberDiff line change
@@ -411,3 +411,47 @@ VOID TEST(KernelFileWriterTest, RealfileTest)
411411
EXPECT_STREQ("HelloWorld", str.substr(20).c_str());
412412
}
413413

414+
VOID TEST(KernelCodecTest, VideoFormatSepcialMProtect_DJI_M30)
415+
{
416+
srs_error_t err;
417+
418+
SrsFormat f;
419+
HELPER_EXPECT_SUCCESS(f.initialize());
420+
421+
// Frame 80442, the sequence header, wireshark filter:
422+
// rtmpt && rtmpt.video.type==1 && rtmpt.video.format==7
423+
HELPER_EXPECT_SUCCESS(f.on_video(0, (char*)""
424+
"\x17\x00\x00\x00\x00\x01\x64\x00\x28\xff\xe1\x00\x12\x67\x64\x00" \
425+
"\x28\xac\xb4\x03\xc0\x11\x34\xa4\x14\x18\x18\x1b\x42\x84\xd4\x01" \
426+
"\x00\x05\x68\xee\x06\xf2\xc0", 39));
427+
428+
MockProtectedBuffer buffer;
429+
if (buffer.alloc(9)) {
430+
EXPECT_TRUE(false) << "mmap failed, errno=" << errno;
431+
return;
432+
}
433+
434+
// Frame 82749
435+
memcpy(buffer.data_, "\x27\x01\x00\x00\x00\x00\x00\x00\x00", buffer.size_);
436+
HELPER_EXPECT_SUCCESS(f.on_video(0, buffer.data_, buffer.size_));
437+
}
438+
439+
VOID TEST(KernelCodecTest, VideoFormatSepcialAsan_DJI_M30)
440+
{
441+
srs_error_t err;
442+
443+
SrsFormat f;
444+
HELPER_EXPECT_SUCCESS(f.initialize());
445+
446+
// Frame 80442, the sequence header, wireshark filter:
447+
// rtmpt && rtmpt.video.type==1 && rtmpt.video.format==7
448+
HELPER_EXPECT_SUCCESS(f.on_video(0, (char*)""
449+
"\x17\x00\x00\x00\x00\x01\x64\x00\x28\xff\xe1\x00\x12\x67\x64\x00" \
450+
"\x28\xac\xb4\x03\xc0\x11\x34\xa4\x14\x18\x18\x1b\x42\x84\xd4\x01" \
451+
"\x00\x05\x68\xee\x06\xf2\xc0", 39));
452+
453+
// Frame 82749
454+
char data[9];
455+
memcpy(data, "\x27\x01\x00\x00\x00\x00\x00\x00\x00", sizeof(data));
456+
HELPER_EXPECT_SUCCESS(f.on_video(0, data, sizeof(data)));
457+
}

0 commit comments

Comments
 (0)