Skip to content

Commit bcafe25

Browse files
committed
Bug#35819974: Mark mysql_stmt_bind_param() API as deprecated
Post-push fix: fix ubsan failures in main.mysql_client_test Change-Id: I8b7a1a23a27dd4a68cd4ae683c66c87970aadf1b
1 parent 99529a2 commit bcafe25

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

sql-common/bind_params.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ static void store_param_str(NET *net, MYSQL_BIND *param) {
225225
/* param->length is always set in mysql_stmt_bind_named_param */
226226
const ulong length = *param->length;
227227
uchar *to = net_store_length(net->write_pos, length);
228+
assert(param->buffer != nullptr);
228229
memcpy(to, param->buffer, length);
229230
net->write_pos = to + length;
230231
}

testclients/mysql_client_test.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -884,8 +884,7 @@ static void test_wl4435() {
884884

885885
/* Bind parameters. */
886886

887-
query_rc = mysql_stmt_bind_named_param(stmt, ps_params,
888-
std::size(ps_params), nullptr);
887+
query_rc = mysql_stmt_bind_named_param(stmt, ps_params, 3, nullptr);
889888
check_execute(stmt, query_rc);
890889

891890
/* Prevent converting to character_set_results. */
@@ -9878,7 +9877,7 @@ static void test_bug3035() {
98789877
rc = mysql_stmt_prepare(stmt, stmt_text, (ulong)strlen(stmt_text));
98799878
check_execute(stmt, rc);
98809879

9881-
mysql_stmt_bind_named_param(stmt, bind_array, std::size(bind_array), nullptr);
9880+
mysql_stmt_bind_named_param(stmt, bind_array, 8, nullptr);
98829881

98839882
int8_val = int8_min;
98849883
uint8_val = uint8_min;
@@ -10954,7 +10953,7 @@ static void test_view_star() {
1095410953
rc = mysql_stmt_prepare(stmt, query, (ulong)strlen(query));
1095510954
check_execute(stmt, rc);
1095610955

10957-
rc = mysql_stmt_bind_named_param(stmt, my_bind, std::size(my_bind), nullptr);
10956+
rc = mysql_stmt_bind_named_param(stmt, my_bind, 2, nullptr);
1095810957
check_execute(stmt, rc);
1095910958

1096010959
for (i = 0; i < 3; i++) {

0 commit comments

Comments
 (0)