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

fix ob20 protocol memcpy out of bound issue

Browse Source
This commit is contained in:
496148326@qq.com 2024-03-27 06:15:52 +00:00 committed by ob-robot
parent 42e74e024d
commit 926c12a4d2
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/oblib/src/rpc/obmysql/ob_mysql_request_utils.cpp vendored
View File

@ -99,6 +99,10 @@ static int build_compressed_packet(ObEasyBuffer &src_buf,
} else {
len_before_compress = next_compress_size;
}
} else if (next_compress_size > comp_buf_size) {
ret = OB_BUF_NOT_ENOUGH;
SERVER_LOG(WARN, "do not use real compress, dst buffer is not enough", K(ret),
K(next_compress_size), K(comp_buf_size), K(lbt()));
} else {
//if compress off, just copy date to output buf
MEMCPY(dst_buf.last() + OB_MYSQL_COMPRESSED_HEADER_SIZE, src_buf.read_pos(), next_compress_size);
@ -144,6 +148,9 @@ static int build_compressed_buffer(ObEasyBuffer &orig_send_buf,
const int64_t max_read_step = context.get_max_read_step();
int64_t next_read_size = orig_send_buf.get_next_read_size(context.last_pkt_pos_, max_read_step);
int64_t last_read_size = 0;
if (next_read_size > (comp_send_buf.write_avail_size() - OB_MYSQL_COMPRESSED_HEADER_SIZE)) {
next_read_size = max_read_step;
}
int64_t max_comp_pkt_size = get_max_comp_pkt_size(next_read_size);
while (OB_SUCC(ret)
&& next_read_size > 0
@ -159,6 +166,9 @@ static int build_compressed_buffer(ObEasyBuffer &orig_send_buf,
//optimize for multi packet
last_read_size = next_read_size;
next_read_size = orig_send_buf.get_next_read_size(context.last_pkt_pos_, max_read_step);
if (next_read_size > (comp_send_buf.write_avail_size() - OB_MYSQL_COMPRESSED_HEADER_SIZE)) {
next_read_size = max_read_step;
}
if (last_read_size != next_read_size) {
max_comp_pkt_size = get_max_comp_pkt_size(next_read_size);
}