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

[CP] fix int_cell_str sanity core && fix mysqltest

Browse Source
This commit is contained in:
obdev
2022-12-16 03:37:51 +00:00
committed by ob-robot
parent 4daf50a3d1
commit a7a929259e
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
deps/oblib/src/rpc/obmysql/ob_mysql_util.cpp vendored
View File

@ -360,16 +360,22 @@ int ObMySQLUtil::int_cell_str(
} }
/* skip bytes_to_store_len bytes to store length */ /* skip bytes_to_store_len bytes to store length */
int64_t bytes_to_store_len = get_number_store_len(length); int64_t bytes_to_store_len = get_number_store_len(length);
MEMCPY(buf + pos + bytes_to_store_len, ffi.ptr(), ffi.length()); if (OB_UNLIKELY(pos + bytes_to_store_len + ffi.length() > len)) {
if (zero_cnt > 0) { ret = OB_SIZE_OVERFLOW;
/*zero_cnt > 0 indicates that zerofill is true */ } else if (zero_cnt > 0 && OB_UNLIKELY(pos + bytes_to_store_len + zero_cnt > len)) {
MEMSET(buf + pos + bytes_to_store_len, '0', zero_cnt); ret = OB_SIZE_OVERFLOW;
MEMCPY(buf + pos + bytes_to_store_len + zero_cnt, ffi.ptr(), ffi.length());
} else { } else {
MEMCPY(buf + pos + bytes_to_store_len, ffi.ptr(), ffi.length()); MEMCPY(buf + pos + bytes_to_store_len, ffi.ptr(), ffi.length());
if (zero_cnt > 0) {
/*zero_cnt > 0 indicates that zerofill is true */
MEMSET(buf + pos + bytes_to_store_len, '0', zero_cnt);
MEMCPY(buf + pos + bytes_to_store_len + zero_cnt, ffi.ptr(), ffi.length());
} else {
MEMCPY(buf + pos + bytes_to_store_len, ffi.ptr(), ffi.length());
}
ret = ObMySQLUtil::store_length(buf, pos + bytes_to_store_len, length, pos);
pos += length;
} }
ret = ObMySQLUtil::store_length(buf, pos + bytes_to_store_len, length, pos);
pos += length;
} else { } else {
switch (obj_type) { switch (obj_type) {
case ObTinyIntType: case ObTinyIntType: