Don't panic when null pointer is provided - log error and return instead #300
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was introduced before we had `borrow()` method on pointer types. We can now remove it.
Lorak-mmk
approved these changes
May 14, 2025
wprzytula
approved these changes
May 15, 2025
Comment on lines
1067
to
1079
| cluster_raw: CassBorrowedExclusivePtr<CassCluster, CMut>, | ||
| enable: cass_bool_t, | ||
| ) -> CassError { | ||
| let cluster = BoxFFI::as_mut_ref(cluster_raw).unwrap(); | ||
| let Some(cluster) = BoxFFI::as_mut_ref(cluster_raw) else { | ||
| tracing::error!( | ||
| "Provided null cluster pointer to cass_cluster_set_use_beta_protocol_version!" | ||
| ); | ||
| return CassError::CASS_ERROR_LIB_BAD_PARAMS; | ||
| }; | ||
|
|
||
| cluster.use_beta_protocol_version = enable == cass_true; | ||
|
|
||
| CassError::CASS_OK |
There was a problem hiding this comment.
❓ Does cass_cluster_set_use_beta_protocol_version() do anything? AFAIK Rust driver supports just one protocol version, so this is a no-op. Shouldn't we rather mark this as deprecated and/or remove its implementation?
There was a problem hiding this comment.
It is read here:
#[unsafe(no_mangle)]
pub unsafe extern "C" fn cass_cluster_set_protocol_version(
cluster_raw: CassBorrowedExclusivePtr<CassCluster, CMut>,
protocol_version: c_int,
) -> CassError {
let Some(cluster) = BoxFFI::as_mut_ref(cluster_raw) else {
tracing::error!("Provided null cluster pointer to cass_cluster_set_protocol_version!");
return CassError::CASS_ERROR_LIB_BAD_PARAMS;
};
if protocol_version == 4 && !cluster.use_beta_protocol_version {
// Rust Driver supports only protocol version 4
CassError::CASS_OK
} else {
CassError::CASS_ERROR_LIB_BAD_PARAMS
}
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #253
Pre-review checklist
[ ] I have implemented Rust unit tests for the features/changes introduced.[ ] I have enabled appropriate tests in.github/workflows/build.ymlingtest_filter.[ ] I have enabled appropriate tests in.github/workflows/cassandra.ymlingtest_filter.