Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2017-04-18 11:41:09 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5e284b58a49c32f20322576ac300367c35105f92
5e284b58
1 parent
33a0abde
Fix #848, crash at HTTP fast buffer grow 2.0.239
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
6 行增加
和
3 行删除
README.md
trunk/src/core/srs_core.hpp
trunk/src/protocol/srs_protocol_buffer.cpp
README.md
查看文件 @
5e284b5
...
...
@@ -336,6 +336,7 @@ Remark:
## History
*
v2.0, 2017-04-18, Fix
[
#848
][
bug #848
]
, crash at HTTP fast buffer grow 2.0.239
*
v2.0, 2017-04-15, Fix
[
#844
][
bug #844
]
, support Haivision encoder. 2.0.238
*
v2.0, 2017-04-15, Merge
[
#846
][
bug #846
]
, fix fd leak for FLV stream caster. 2.0.237
*
v2.0, 2017-04-15, Merge
[
#841
][
bug #841
]
, avoid the duplicated sps/pps in ts. 2.0.236
...
...
@@ -1287,6 +1288,7 @@ Winlin
[
bug #841
]:
https://github.com/ossrs/srs/issues/841
[
bug #846
]:
https://github.com/ossrs/srs/issues/846
[
bug #844
]:
https://github.com/ossrs/srs/issues/844
[
bug #848
]:
https://github.com/ossrs/srs/issues/848
[
bug #xxxxxxxxxx
]:
https://github.com/ossrs/srs/issues/xxxxxxxxxx
[
exo #828
]:
https://github.com/google/ExoPlayer/pull/828
...
...
trunk/src/core/srs_core.hpp
查看文件 @
5e284b5
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
#define VERSION_REVISION 23
8
#define VERSION_REVISION 23
9
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
...
...
trunk/src/protocol/srs_protocol_buffer.cpp
查看文件 @
5e284b5
...
...
@@ -160,9 +160,10 @@ int SrsFastBuffer::grow(ISrsBufferReader* reader, int required_size)
// reset when buffer is empty.
p
=
end
=
buffer
;
srs_verbose
(
"all consumed, reset fast buffer"
);
}
else
{
}
else
if
(
nb_exists_bytes
<
nb_buffer
&&
p
>
buffer
)
{
// move the left bytes to start of buffer.
srs_assert
(
nb_exists_bytes
<
nb_buffer
);
// @remark Only move memory when space is enough, or failed at next check.
// @see https://github.com/ossrs/srs/issues/848
buffer
=
(
char
*
)
memmove
(
buffer
,
p
,
nb_exists_bytes
);
p
=
buffer
;
end
=
p
+
nb_exists_bytes
;
...
...
请
注册
或
登录
后发表评论