避免m3u8文件为chunked时崩溃 (#1543)

* Update HttpChunkedSplitter.h

* 避免m3u8文件为chunked时崩溃

具体问题见
https://github.com/ZLMediaKit/ZLMediaKit/issues/1407

当数据最后小于2个字节时, 应该放弃回调.
做个保险, 避免导致溢出后崩溃.

这个bug很难出现, 但是的确存在. 一些特殊的服务器采用chunked返回的m3u8文件解析时, 有可能会遇到.

* Update HttpChunkedSplitter.cpp

Co-authored-by: 夏楚 <771730766@qq.com>
This commit is contained in:
alexliyu7352 2022-04-06 14:16:48 +08:00 committed by GitHub
parent e4262222f4
commit 75b17b3a6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions

View File

@ -9,29 +9,32 @@
*/ */
#include <string.h> #include <string.h>
#include "Common/macros.h"
#include "HttpChunkedSplitter.h" #include "HttpChunkedSplitter.h"
using namespace std; using namespace std;
//[chunk size][\r\n][chunk data][\r\n][chunk size][\r\n][chunk data][\r\n][chunk size = 0][\r\n][\r\n]
namespace mediakit{ namespace mediakit{
const char *HttpChunkedSplitter::onSearchPacketTail(const char *data, size_t len) { const char *HttpChunkedSplitter::onSearchPacketTail(const char *data, size_t len) {
auto pos = strstr(data,"\r\n"); auto pos = strstr(data, "\r\n");
if(!pos){ if (!pos) {
return nullptr; return nullptr;
} }
return pos + 2; return pos + 2;
} }
void HttpChunkedSplitter::onRecvContent(const char *data, size_t len) { void HttpChunkedSplitter::onRecvContent(const char *data, size_t len) {
onRecvChunk(data,len - 2); onRecvChunk(data, len - 2);
} }
ssize_t HttpChunkedSplitter::onRecvHeader(const char *data, size_t len) { ssize_t HttpChunkedSplitter::onRecvHeader(const char *data, size_t len) {
string str(data,len - 2); int size;
int ret; CHECK(sscanf(data, "%X", &size) == 1 && size >= 0);
sscanf(str.data(),"%X",&ret); //包括后面\r\n两个字节
return ret + 2; return size + 2;
} }
}//namespace mediakit }//namespace mediakit

View File

@ -21,12 +21,10 @@ public:
/** /**
* len == 0 * len == 0
*/ */
typedef std::function<void (const char *data,size_t len)> onChunkData; using onChunkData = std::function<void(const char *data, size_t len)>;
HttpChunkedSplitter(const onChunkData &cb){ HttpChunkedSplitter(const onChunkData &cb) { _onChunkData = cb; };
_onChunkData = cb; ~HttpChunkedSplitter() override { _onChunkData = nullptr; };
};
~HttpChunkedSplitter() override {} ;
protected: protected:
ssize_t onRecvHeader(const char *data,size_t len) override; ssize_t onRecvHeader(const char *data,size_t len) override;