Skip to content

O
oceanbase

Metz / oceanbase
与 Fork 源项目一致

Fork自 oceanbase / oceanbase

通知 1
Star 0
Fork 0
O
oceanbase

体验新版 GitCode，发现更多精彩内容 >>

提交 86294613 编写于 作者: J jy0 提交者： LINGuanRen
浏览文件
操作

primary_zone length overflow when memcpy

上级 d10ad3a0
隐藏空白更改
内联 并排
Showing with 36 addition and 21 deletion
src/share/ob_primary_zone_util.cpp
浏览文件 @ 86294613
...@@ -41,17 +41,22 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObString>& zone_list) ...@@ -41,17 +41,22 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObString>& zone_list)
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 = strlen(primary_zone_.ptr());
MEMCPY(primary_zone_str_, primary_zone_.ptr(), len); if (common::MAX_ZONE_LENGTH < len) {
primary_zone_str_[len] = '\0'; ret = OB_ERR_UNEXPECTED;
common::ObZone zone; LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
for (int64_t i = 0; OB_SUCC(ret) && i < zone_list.count(); ++i) { } else {
zone.reset(); MEMCPY(primary_zone_str_, primary_zone_.ptr(), len);
if (OB_FAIL(zone.assign(zone_list.at(i).ptr()))) { primary_zone_str_[len] = '\0';
LOG_WARN("fail to assign zone", K(ret)); common::ObZone zone;
} else if (OB_FAIL(zone_list_.push_back(zone))) { for (int64_t i = 0; OB_SUCC(ret) && i < zone_list.count(); ++i) {
LOG_WARN("fail to push back", K(ret)); zone.reset();
} else { if (OB_FAIL(zone.assign(zone_list.at(i).ptr()))) {
} // no more to do LOG_WARN("fail to assign zone", K(ret));
} else if (OB_FAIL(zone_list_.push_back(zone))) {
LOG_WARN("fail to push back", K(ret));
} else {
} // no more to do
}
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
is_inited_ = true; is_inited_ = true;
...@@ -73,13 +78,18 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObZone>& zone_list) ...@@ -73,13 +78,18 @@ int ObPrimaryZoneUtil::init(const common::ObIArray<common::ObZone>& zone_list)
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 = strlen(primary_zone_.ptr());
MEMCPY(primary_zone_str_, primary_zone_.ptr(), len); if (common::MAX_ZONE_LENGTH < len) {
primary_zone_str_[len] = '\0'; ret = OB_ERR_UNEXPECTED;
for (int64_t i = 0; OB_SUCC(ret) && i < zone_list.count(); ++i) { LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
if (OB_FAIL(zone_list_.push_back(zone_list.at(i)))) { } else {
LOG_WARN("fail to push back", K(ret)); MEMCPY(primary_zone_str_, primary_zone_.ptr(), len);
} else { primary_zone_str_[len] = '\0';
} // no more to do for (int64_t i = 0; OB_SUCC(ret) && i < zone_list.count(); ++i) {
if (OB_FAIL(zone_list_.push_back(zone_list.at(i)))) {
LOG_WARN("fail to push back", K(ret));
} else {
} // no more to do
}
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
is_inited_ = true; is_inited_ = true;
...@@ -100,9 +110,14 @@ int ObPrimaryZoneUtil::init() ...@@ -100,9 +110,14 @@ int ObPrimaryZoneUtil::init()
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 = strlen(primary_zone_.ptr());
MEMCPY(primary_zone_str_, primary_zone_.ptr(), len); if (common::MAX_ZONE_LENGTH < len) {
primary_zone_str_[len] = '\0'; ret = OB_ERR_UNEXPECTED;
is_inited_ = true; LOG_WARN("primary_zone length overflowed", KR(ret), K(len), "max_zone_length", MAX_ZONE_LENGTH);
} else {
MEMCPY(primary_zone_str_, primary_zone_.ptr(), len);
primary_zone_str_[len] = '\0';
is_inited_ = true;
}
} }
return ret; return ret;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或