amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

兼容rtsp服务端发送缓冲区溢出覆盖的bug

Browse Source
This commit is contained in:
admin 2024-05-15 11:17:12 +08:00 committed by PioLing
parent 5df2b80757
commit 472d7d1e4f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Rtsp/RtspSplitter.cpp
View File

@ -10,8 +10,9 @@
#include <cstdlib>
#include "RtspSplitter.h"
#include "Util/logger.h"
#include "Util/util.h"
#include "Util/logger.h"
#include "Common/macros.h"
using namespace std;
using namespace toolkit;
@ -64,7 +65,18 @@ ssize_t RtspSplitter::onRecvHeader(const char *data, size_t len) {
if (len == 4 && !memcmp(data, "\r\n\r\n", 4)) {
return 0;
}
_parser.parse(data, len);
try {
_parser.parse(data, len);
} catch (mediakit::AssertFailedException &ex){
if (!_enableRecvRtp) {
// 还在握手中，直接中断握手
throw;
}
// 握手已经结束，如果rtsp server存在发送缓存溢出的bug，那么rtsp信令可能跟rtp混在一起
// 这种情况下，rtsp信令解析异常不中断链接，只丢弃这个包
WarnL << ex.what();
return 0;
}
auto ret = getContentLength(_parser);
if (ret == 0) {
onWholeRtspPacket(_parser);