hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] [bugfix] primary_zone length overflow when memcpy

Browse Source
This commit is contained in:
obdev
2022-05-25 20:48:53 +08:00
committed by wangzelin.wzl
parent da2dcef17c
commit c6b6dbcc47
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/ob_primary_zone_util.cpp
View File

@ -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)
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()
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);