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

[BUGFIX] fix over size input

Browse Source
This commit is contained in:
skylhd 2023-07-20 02:18:25 +00:00 committed by ob-robot
parent 3527fd9ded
commit 73c39f6fef
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -2215,6 +2215,9 @@ int ObMPStmtExecute::parse_basic_param_value(ObIAllocator &allocator,
str.assign_ptr(data, static_cast<ObString::obstr_size_t>(length));
}
if (OB_FAIL(ret)) {
} else if (length > OB_MAX_LONGTEXT_LENGTH) {
ret = OB_ERR_INVALID_INPUT_ARGUMENT;
LOG_WARN("input param len is over size", K(ret), K(length));
} else if (MYSQL_TYPE_OB_NVARCHAR2 == type
|| MYSQL_TYPE_OB_NCHAR == type) {
OZ(copy_or_convert_str(allocator, cur_cs_type, ncs_type, str, dst));

24
src/sql/resolver/ob_resolver_utils.cpp
View File

@ -2064,13 +2064,18 @@ int ObResolverUtils::resolve_const(const ParseNode *node,
val.set_result_flag(NOT_NULL_FLAG);
switch (node->type_) {
case T_HEX_STRING: {
ObString str_val;
str_val.assign_ptr(const_cast<char *>(node->str_value_), static_cast<int32_t>(node->str_len_));
val.set_hex_string(str_val);
val.set_collation_level(CS_LEVEL_COERCIBLE);
val.set_scale(0);
val.set_length(static_cast<int32_t>(node->str_len_));
val.set_param_meta(val.get_meta());
if (node->str_len_ > OB_MAX_LONGTEXT_LENGTH) {
ret = OB_ERR_INVALID_INPUT_ARGUMENT;
LOG_WARN("input str len is over size", K(ret), K(node->str_len_));
} else {
ObString str_val;
str_val.assign_ptr(const_cast<char *>(node->str_value_), static_cast<int32_t>(node->str_len_));
val.set_hex_string(str_val);
val.set_collation_level(CS_LEVEL_COERCIBLE);
val.set_scale(0);
val.set_length(static_cast<int32_t>(node->str_len_));
val.set_param_meta(val.get_meta());
}
break;
}
case T_VARCHAR:
@ -2114,7 +2119,10 @@ int ObResolverUtils::resolve_const(const ParseNode *node,
// val.set_collation_type(ObCharset::get_default_collation(ObCharset::get_default_charset()));
// LOG_DEBUG("oracle use default cs_type", K(val), K(connection_collation));
// } else if (0 == node->num_child_) {
if (0 == node->num_child_) {
if (node->str_len_ > OB_MAX_LONGTEXT_LENGTH) {
ret = OB_ERR_INVALID_INPUT_ARGUMENT;
LOG_WARN("input str len is over size", K(ret), K(node->str_len_));
} else if (0 == node->num_child_) {
// for STRING without collation, e.g. show tables like STRING;
if (lib::is_mysql_mode() && is_nchar) {
ObString charset(strlen("utf8mb4"), "utf8mb4");