Skip to content

O
oceanbase

Metz / oceanbase
与 Fork 源项目一致

Fork自 oceanbase / oceanbase

通知 1
Star 0
Fork 0
O
oceanbase
提交 c6b6dbcc 编写于 作者: O obdev 提交者： wangzelin.wzl
浏览文件
操作

[CP] [bugfix] primary_zone length overflow when memcpy

上级 da2dcef1
隐藏空白更改
内联 并排
Showing with 3 addition and 3 deletion
src/share/ob_primary_zone_util.cpp
浏览文件 @ c6b6dbcc
...@@ -40,7 +40,7 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObString>& zone_list) ...@@ -40,7 +40,7 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObString>& zone_list)
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(primary_zone_), "zone list count", zone_list.count(), KP(zone_region_list_)); LOG_WARN("invalid argument", K(ret), K(primary_zone_), "zone list count", zone_list.count(), KP(zone_region_list_));
} else { } else {
int64_t len = strlen(primary_zone_.ptr()); int64_t len = primary_zone_.length();
if (common::MAX_ZONE_LENGTH < len) { if (common::MAX_ZONE_LENGTH < len) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH); LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
...@@ -77,7 +77,7 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObZone>& zone_list) ...@@ -77,7 +77,7 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObZone>& zone_list)
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(primary_zone_), "zone list count", zone_list.count(), KP(zone_region_list_)); LOG_WARN("invalid argument", K(ret), K(primary_zone_), "zone list count", zone_list.count(), KP(zone_region_list_));
} else { } else {
int64_t len = strlen(primary_zone_.ptr()); int64_t len = primary_zone_.length();
if (common::MAX_ZONE_LENGTH < len) { if (common::MAX_ZONE_LENGTH < len) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH); LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
...@@ -109,7 +109,7 @@ int ObPrimaryZoneUtil::init() ...@@ -109,7 +109,7 @@ int ObPrimaryZoneUtil::init()
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(primary_zone_), KP(zone_region_list_)); LOG_WARN("invalid argument", K(ret), K(primary_zone_), KP(zone_region_list_));
} else { } else {
int64_t len = strlen(primary_zone_.ptr()); int64_t len = primary_zone_.length();
if (common::MAX_ZONE_LENGTH < len) { if (common::MAX_ZONE_LENGTH < len) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH); LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或