From 39a2d51c66dd769a69e74bf8a7b3db593e93ecdd Mon Sep 17 00:00:00 2001 From: zhengfl Date: Wed, 22 Jul 2015 12:08:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=20#445,=20=E4=BF=AE=E6=AD=A3=E7=94=B1sk?= =?UTF-8?q?ip(-4)=E5=BC=95=E8=B5=B7=E7=9A=84assert=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trunk/src/protocol/srs_protocol_buffer.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 trunk/src/protocol/srs_protocol_buffer.cpp diff --git a/trunk/src/protocol/srs_protocol_buffer.cpp b/trunk/src/protocol/srs_protocol_buffer.cpp old mode 100644 new mode 100755 index 9efa26d78..468f73d1e --- a/trunk/src/protocol/srs_protocol_buffer.cpp +++ b/trunk/src/protocol/srs_protocol_buffer.cpp @@ -114,8 +114,9 @@ char SrsFastBuffer::read_1byte() char* SrsFastBuffer::read_slice(int size) { + srs_assert(size >= 0); srs_assert(end - p >= size); - srs_assert(p + size > buffer); + srs_assert(p + size >= buffer); char* ptr = p; p += size; @@ -126,7 +127,7 @@ char* SrsFastBuffer::read_slice(int size) void SrsFastBuffer::skip(int size) { srs_assert(end - p >= size); - srs_assert(p + size > buffer); + srs_assert(p + size >= buffer); p += size; } From bc033d5de309826c05b6bb7c7ff89c4415d7f3e7 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 23 Jul 2015 14:20:46 +0800 Subject: [PATCH 2/2] refine code, move default to config function. --- trunk/src/app/srs_app_config.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index b2cfec55f..a5fd507bf 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -133,7 +133,6 @@ using namespace _srs_internal; #define SRS_CONF_DEFAULT_TRANSCODE_IFORMAT "flv" #define SRS_CONF_DEFAULT_TRANSCODE_OFORMAT "flv" -#define SRS_CONF_DEFAULT_EDGE_MODE false #define SRS_CONF_DEFAULT_EDGE_TOKEN_TRAVERSE false #define SRS_CONF_DEFAULT_EDGE_TRANSFORM_VHOST "[vhost]" @@ -2743,17 +2742,18 @@ bool SrsConfig::get_vhost_is_edge(string vhost) bool SrsConfig::get_vhost_is_edge(SrsConfDirective* vhost) { + static bool DEFAULT = false; SrsConfDirective* conf = vhost; - + if (!conf) { - return SRS_CONF_DEFAULT_EDGE_MODE; + return DEFAULT; } - + conf = conf->get("mode"); if (!conf || conf->arg0().empty()) { - return SRS_CONF_DEFAULT_EDGE_MODE; + return DEFAULT; } - + return "remote" == conf->arg0(); }