Skip to content

Commit 8f46ed7

Browse files
authored
Merge pull request #47 from microsoft/dev/saurabh/sync
Sync ADO main with GH Main
2 parents 5455787 + 06e7d01 commit 8f46ed7

7 files changed

Lines changed: 584 additions & 123 deletions

File tree

mssql-js/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,9 +1302,9 @@ __metadata:
13021302
linkType: hard
13031303

13041304
"flatted@npm:^3.2.9":
1305-
version: 3.3.3
1306-
resolution: "flatted@npm:3.3.3"
1307-
checksum: 10c0/e957a1c6b0254aa15b8cce8533e24165abd98fadc98575db082b786b5da1b7d72062b81bfdcd1da2f4d46b6ed93bec2434e62333e9b4261d79ef2e75a10dd538
1305+
version: 3.4.2
1306+
resolution: "flatted@npm:3.4.2"
1307+
checksum: 10c0/a65b67aae7172d6cdf63691be7de6c5cd5adbdfdfe2e9da1a09b617c9512ed794037741ee53d93114276bff3f93cd3b0d97d54f9b316e1e4885dde6e9ffdf7ed
13081308
languageName: node
13091309
linkType: hard
13101310

@@ -1658,9 +1658,9 @@ __metadata:
16581658
linkType: hard
16591659

16601660
"lodash@npm:^4.0.0, lodash@npm:^4.17.15, lodash@npm:^4.17.4":
1661-
version: 4.17.21
1662-
resolution: "lodash@npm:4.17.21"
1663-
checksum: 10c0/d8cbea072bb08655bb4c989da418994b073a608dffa608b09ac04b43a791b12aeae7cd7ad919aa4c925f33b48490b5cfe6c1f71d827956071dae2e7bb3a6b74c
1661+
version: 4.18.1
1662+
resolution: "lodash@npm:4.18.1"
1663+
checksum: 10c0/757228fc68805c59789e82185135cf85f05d0b2d3d54631d680ca79ec21944ec8314d4533639a14b8bcfbd97a517e78960933041a5af17ecb693ec6eecb99a27
16641664
languageName: node
16651665
linkType: hard
16661666

@@ -1955,9 +1955,9 @@ __metadata:
19551955
linkType: hard
19561956

19571957
"picomatch@npm:^2.3.1":
1958-
version: 2.3.1
1959-
resolution: "picomatch@npm:2.3.1"
1960-
checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
1958+
version: 2.3.2
1959+
resolution: "picomatch@npm:2.3.2"
1960+
checksum: 10c0/a554d1709e59be97d1acb9eaedbbc700a5c03dbd4579807baed95100b00420bc729335440ef15004ae2378984e2487a7c1cebd743cfdb72b6fa9ab69223c0d61
19611961
languageName: node
19621962
linkType: hard
19631963

mssql-tds/fuzz/fuzz_targets/fuzz_api_inputs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ fuzz_target!(|data: &[u8]| {
262262
// - Memory allocation for large parameter lists
263263
// - Handling of None parameter names
264264
let mut params_list = String::new();
265-
build_parameter_list_string(&rpc_params, &mut params_list);
265+
let _ = build_parameter_list_string(&rpc_params, &mut params_list);
266266
}
267267
}
268268
});

mssql-tds/src/connection/tds_client.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ impl TdsClient {
482482
// Build the comma separated list of parameters
483483
let mut params_list_as_string = String::new();
484484

485-
build_parameter_list_string(&named_params, &mut params_list_as_string);
485+
build_parameter_list_string(&named_params, &mut params_list_as_string)?;
486486

487487
let params_as_sql_string = SqlType::NVarcharMax(Some(SqlString::from_utf8_string(
488488
params_list_as_string.clone(),
@@ -881,7 +881,7 @@ impl TdsClient {
881881
// Build the comma separated list of parameters
882882
let mut params_list_as_string = String::new();
883883

884-
build_parameter_list_string(&named_params, &mut params_list_as_string);
884+
build_parameter_list_string(&named_params, &mut params_list_as_string)?;
885885

886886
let params_as_sql_string =
887887
SqlType::NVarcharMax(Some(SqlString::from_utf8_string(params_list_as_string)));
@@ -1047,7 +1047,7 @@ impl TdsClient {
10471047
// Build the comma separated list of parameters
10481048
let mut params_list_as_string = String::new();
10491049

1050-
build_parameter_list_string(&named_params, &mut params_list_as_string);
1050+
build_parameter_list_string(&named_params, &mut params_list_as_string)?;
10511051

10521052
let params_as_sql_string =
10531053
SqlType::NVarcharMax(Some(SqlString::from_utf8_string(params_list_as_string)));

0 commit comments

Comments
 (0)