Fix dereference error of 'shared_secret_handle' (#6404)

cferreiragonz · web-flow · commit f59b2c282858 · 2026-05-21T07:27:09.000+02:00
Signed-off-by: Carlos Ferreira González &lt;carlosferreira@eprosima.com&gt;
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
@@ -2970,7 +2970,7 @@ bool SecurityManager::discovered_reader(
 
         if (local_writer != writer_handles_.end())
         {
-            if (remote_participant_crypto_handle != nullptr)
+            if (remote_participant_crypto_handle != nullptr && shared_secret_handle != nullptr)
             {
                 DatareaderCryptoHandle* remote_reader_handle =
                         crypto_plugin_->cryptokeyfactory()->register_matched_remote_datareader(
@@ -3330,7 +3330,7 @@ bool SecurityManager::discovered_writer(
 
         if (local_reader != reader_handles_.end())
         {
-            if (remote_participant_crypto_handle != nullptr)
+            if (remote_participant_crypto_handle != nullptr && shared_secret_handle != nullptr)
             {
                 DatawriterCryptoHandle* remote_writer_handle =
                         crypto_plugin_->cryptokeyfactory()->register_matched_remote_datawriter(

Original file line number	Diff line number	Diff line change
`@@ -2970,7 +2970,7 @@ bool SecurityManager::discovered_reader(`
`2970`	`2970`
`2971`	`2971`	`if (local_writer != writer_handles_.end())`
`2972`	`2972`	`{`
`2973`		`- if (remote_participant_crypto_handle != nullptr)`
	`2973`	`+ if (remote_participant_crypto_handle != nullptr && shared_secret_handle != nullptr)`
`2974`	`2974`	`{`
`2975`	`2975`	`DatareaderCryptoHandle* remote_reader_handle =`
`2976`	`2976`	`crypto_plugin_->cryptokeyfactory()->register_matched_remote_datareader(`
`@@ -3330,7 +3330,7 @@ bool SecurityManager::discovered_writer(`
`3330`	`3330`
`3331`	`3331`	`if (local_reader != reader_handles_.end())`
`3332`	`3332`	`{`
`3333`		`- if (remote_participant_crypto_handle != nullptr)`
	`3333`	`+ if (remote_participant_crypto_handle != nullptr && shared_secret_handle != nullptr)`
`3334`	`3334`	`{`
`3335`	`3335`	`DatawriterCryptoHandle* remote_writer_handle =`
`3336`	`3336`	`crypto_plugin_->cryptokeyfactory()->register_matched_remote_datawriter(`