mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-30 07:26:53 +08:00
75b17b3a6a
* 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>
41 lines
1.1 KiB
C++
41 lines
1.1 KiB
C++
/*
|
|
* Copyright (c) 2016 The ZLMediaKit project authors. All Rights Reserved.
|
|
*
|
|
* This file is part of ZLMediaKit(https://github.com/xia-chu/ZLMediaKit).
|
|
*
|
|
* Use of this source code is governed by MIT license that can be found in the
|
|
* LICENSE file in the root of the source tree. All contributing project authors
|
|
* may be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include "Common/macros.h"
|
|
#include "HttpChunkedSplitter.h"
|
|
|
|
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{
|
|
|
|
const char *HttpChunkedSplitter::onSearchPacketTail(const char *data, size_t len) {
|
|
auto pos = strstr(data, "\r\n");
|
|
if (!pos) {
|
|
return nullptr;
|
|
}
|
|
return pos + 2;
|
|
}
|
|
|
|
void HttpChunkedSplitter::onRecvContent(const char *data, size_t len) {
|
|
onRecvChunk(data, len - 2);
|
|
}
|
|
|
|
ssize_t HttpChunkedSplitter::onRecvHeader(const char *data, size_t len) {
|
|
int size;
|
|
CHECK(sscanf(data, "%X", &size) == 1 && size >= 0);
|
|
//包括后面\r\n两个字节
|
|
return size + 2;
|
|
}
|
|
|
|
}//namespace mediakit
|