rgw/amqp: fix valgrind errors on uninitialized memory

Fixes: https://tracker.ceph.com/issues/64690
Signed-off-by: Yuval Lifshitz <ylifshit@ibm.com>

diff --git a/src/rgw/rgw_amqp.cc b/src/rgw/rgw_amqp.cc
index e676b7b044bc5e07c6ea3eceb3fe4d60eef29af0..0e4025516a04b72582526d8a0944ae035c45e55f 100644 (file)
--- a/src/rgw/rgw_amqp.cc
+++ b/src/rgw/rgw_amqp.cc
@@ -513,10 +513,10 @@ bool new_state(connection_t* conn, const connection_id_t& conn_id) {
 
 /// struct used for holding messages in the message queue
 struct message_wrapper_t {
-  connection_id_t conn_id;
-  std::string topic;
-  std::string message;
-  reply_callback_t cb;
+  const connection_id_t conn_id;
+  const std::string topic;
+  const std::string message;
+  const reply_callback_t cb;
 
   message_wrapper_t(const connection_id_t& _conn_id,
       const std::string& _topic,

diff --git a/src/rgw/rgw_amqp.h b/src/rgw/rgw_amqp.h
index c363f4d740348208d7566f284fe3500a09839106..99bd3aef1ed5062709ea92d47139da441fdfcbd7 100644 (file)
--- a/src/rgw/rgw_amqp.h
+++ b/src/rgw/rgw_amqp.h
@@ -26,10 +26,10 @@ void shutdown();
 // key class for the connection list
 struct connection_id_t {
   std::string host;
-  int port;
+  int port = 0;
   std::string vhost;
   std::string exchange;
-  bool ssl;
+  bool ssl = false;
   connection_id_t() = default;
   connection_id_t(const amqp_connection_info& info, const std::string& _exchange);
 };