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

fix bin2uuid cause stack overflow

Browse Source
This commit is contained in:
ChangerR
2024-04-10 13:15:24 +00:00
committed by ob-robot
parent aeeef83dac
commit 664822467e
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/sql/engine/expr/ob_expr_uuid.cpp
View File

@ -857,17 +857,19 @@ int ObExprBin2uuid::bin2uuid(const ObExpr &expr, ObEvalCtx &ctx, ObDatum &expr_d
} else if (OB_ISNULL(bin_text_ptr) || UuidCommon::BYTE_LENGTH != bin_text.length()) { } else if (OB_ISNULL(bin_text_ptr) || UuidCommon::BYTE_LENGTH != bin_text.length()) {
ObString string_type_str("binary"); ObString string_type_str("binary");
ObString func_str(N_BIN_TO_UUID); ObString func_str(N_BIN_TO_UUID);
char hex_buf[bin_text.length()*2]; int text_len = std::min(bin_text.length(), UuidCommon::BYTE_LENGTH * 2);
int64_t pos = 0; SMART_VAR(char[UuidCommon::BYTE_LENGTH * 4], hex_buf) {
if (OB_SUCC(common::hex_print(bin_text.ptr(), bin_text.length(), hex_buf, bin_text.length()*2, pos))) { int64_t pos = 0;
ret = OB_ERR_INCORRECT_VALUE_FOR_FUNCTION; if (OB_SUCC(common::hex_print(bin_text.ptr(), text_len, hex_buf, text_len*2, pos))) {
LOG_USER_ERROR(OB_ERR_INCORRECT_VALUE_FOR_FUNCTION, ret = OB_ERR_INCORRECT_VALUE_FOR_FUNCTION;
string_type_str.length(), string_type_str.ptr(), LOG_USER_ERROR(OB_ERR_INCORRECT_VALUE_FOR_FUNCTION,
bin_text.length()*2, hex_buf, string_type_str.length(), string_type_str.ptr(),
func_str.length(), func_str.ptr()); text_len*2, hex_buf,
LOG_WARN("incorrect string value for function bin_to_uuid", K(ret), K(bin_text)); func_str.length(), func_str.ptr());
} else { LOG_WARN("incorrect string value for function bin_to_uuid", K(ret), K(bin_text));
LOG_WARN("fail to print incorrect hex string value", K(ret), K(bin_text)); } else {
LOG_WARN("fail to print incorrect hex string value", K(ret), K(bin_text));
}
} }
} else if (need_swap) { } else if (need_swap) {
// The first 4 bytes are restored to "time-low". // The first 4 bytes are restored to "time-low".
@ -944,17 +946,19 @@ int ObExprBin2uuid::bin2uuid_batch(const ObExpr &expr,
} else if (OB_ISNULL(bin_text_ptr) || UuidCommon::BYTE_LENGTH != bin_text.length()) { } else if (OB_ISNULL(bin_text_ptr) || UuidCommon::BYTE_LENGTH != bin_text.length()) {
ObString string_type_str("binary"); ObString string_type_str("binary");
ObString func_str(N_BIN_TO_UUID); ObString func_str(N_BIN_TO_UUID);
char hex_buf[bin_text.length()*2]; int text_len = std::min(bin_text.length(), UuidCommon::BYTE_LENGTH * 2);
int64_t pos = 0; SMART_VAR(char[UuidCommon::BYTE_LENGTH * 4], hex_buf) {
if (OB_SUCC(common::hex_print(bin_text.ptr(), bin_text.length(), hex_buf, bin_text.length()*2, pos))) { int64_t pos = 0;
ret = OB_ERR_INCORRECT_VALUE_FOR_FUNCTION; if (OB_SUCC(common::hex_print(bin_text.ptr(), text_len, hex_buf, text_len*2, pos))) {
LOG_USER_ERROR(OB_ERR_INCORRECT_VALUE_FOR_FUNCTION, ret = OB_ERR_INCORRECT_VALUE_FOR_FUNCTION;
string_type_str.length(), string_type_str.ptr(), LOG_USER_ERROR(OB_ERR_INCORRECT_VALUE_FOR_FUNCTION,
bin_text.length()*2, hex_buf, string_type_str.length(), string_type_str.ptr(),
func_str.length(), func_str.ptr()); text_len*2, hex_buf,
LOG_WARN("incorrect string value for function bin_to_uuid", K(ret), K(bin_text)); func_str.length(), func_str.ptr());
} else { LOG_WARN("incorrect string value for function bin_to_uuid", K(ret), K(bin_text));
LOG_WARN("fail to print incorrect hex string value", K(ret), K(bin_text)); } else {
LOG_WARN("fail to print incorrect hex string value", K(ret), K(bin_text));
}
} }
} else if (need_swap) { } else if (need_swap) {
// The first 4 bytes are restored to "time-low". // The first 4 bytes are restored to "time-low".