Bug#37278704: Do not throw exceptions from destructors

Note: throwing from destructors was the root cause for the bug.

Author: rsomla1

cdk/core/session.cc

@@ -53,7 +53,7 @@ struct Session_builder
 
   struct ReportStatus
   {
-    //False if not able to connect, true if all is good.
+    // False if not able to connect, true if all is good.
     option_t m_status = false;
     Session_builder::ep_filter_t m_filter;
     size_t m_id;
@@ -63,6 +63,12 @@ struct Session_builder
       , m_id(id)
     {}
 
+    /*
+      Note: The only reason for ReportStatus object is to use RAII to invoke
+      m_filter() on destruction to report session creation status. So this
+      is part of logic of methods that use such object and as such is allowed
+      to throw errors from the dtor.
+    */
 
     ~ReportStatus()
     {
@@ -481,7 +487,7 @@ Session::Session(ds::Unix_socket &ds, const ds::Unix_socket::Options &options)
 #endif //#ifndef WIN32
 
 
-Session::~Session()
+Session::~Session() NOEXCEPT
 {
   delete m_session;
   delete m_connection;

cdk/foundation/connection_openssl.cc

@@ -265,12 +265,12 @@ class connection_TLS_impl
     , m_options(options)
   {}
 
-  ~connection_TLS_impl()
+  ~connection_TLS_impl() NOEXCEPT
   {
     if (m_tls)
     {
       /*
-      Server is expecting a SSL quiet shutdown.
+        Server is expecting a SSL quiet shutdown.
       */
       SSL_set_quiet_shutdown(m_tls, 1);
       SSL_shutdown(m_tls);
@@ -697,7 +697,7 @@ class safe_X509
     : m_X509(obj)
   {}
 
-  ~safe_X509()
+  ~safe_X509() NOEXCEPT
   {
     if (std::is_same<X, X509>::value)
     {

cdk/foundation/connection_tcpip.cc

@@ -138,7 +138,7 @@ class Socket_system_initializer
     detail::initialize_socket_system();
   }
 
-  ~Socket_system_initializer()
+  ~Socket_system_initializer() NOEXCEPT
   {
     try
     {

cdk/foundation/connection_tcpip_base.h

@@ -110,9 +110,9 @@ class Socket_base::Impl
     return detail::poll_one(m_sock, detail::POLL_MODE_WRITE, false) > 0;
   }
 
-  virtual ~Impl()
+  virtual ~Impl() NOEXCEPT
   {
-    close();
+    try { close(); } catch (...) {}
   }
 
   virtual void do_connect() =0;

cdk/foundation/socket_detail.cc

@@ -643,7 +643,7 @@ Socket connect(const char *host_name, unsigned short port,
   struct AddrInfoGuard
   {
     addrinfo* list;
-    ~AddrInfoGuard() { freeaddrinfo(list); }
+    ~AddrInfoGuard() NOEXCEPT { freeaddrinfo(list); }
   }
   guard = { host_list };
 
@@ -916,6 +916,13 @@ void recv(Socket socket, byte *buffer, size_t buffer_size)
 
   size_t bytes_received = 0;
 
+  /*
+    Note: In presence of timeouts recv_some() can return 0 which would lead
+    to an infinite loop here! See also bug#37278716.
+
+    A solution would be to throw error if timeout was hit?
+  */
+
   while (bytes_received != buffer_size)
     bytes_received += recv_some(socket, buffer + bytes_received, buffer_size - bytes_received, true);
 }

cdk/include/mysql/cdk/api/document.h

@@ -107,7 +107,7 @@ class Any_processor
 
   virtual Doc_prc*    doc() =0;
 
-  virtual ~Any_processor() {}
+  virtual ~Any_processor() NOEXCEPT {}
 };
 
 
@@ -156,7 +156,7 @@ class Doc_processor
   */
   virtual Any_prc* key_val(const string &key) =0;
 
-  virtual ~Doc_processor() {}
+  virtual ~Doc_processor() NOEXCEPT {}
 };
 
 

cdk/include/mysql/cdk/api/obj_ref.h

@@ -47,7 +47,7 @@ class Ref_base
 {
 public:
 
-  virtual ~Ref_base() {}
+  virtual ~Ref_base() NOEXCEPT {}
 
   virtual const string name() const =0;
   virtual const string orig_name() const { return name(); }

cdk/include/mysql/cdk/api/session.h

@@ -44,7 +44,7 @@ class Session
 {
 public:
 
-  virtual ~Session() {}
+  virtual ~Session() NOEXCEPT {}
 
   // Check if given session is valid. Function is_valid() performs a lightweight, local check while
   // check_valid() might communicate with the data store to perform this check.

cdk/include/mysql/cdk/codec.h

@@ -371,7 +371,7 @@ class Codec<TYPE_FLOAT>
 
   Codec(const Format_info &fi) : Codec_base<TYPE_FLOAT>(fi) {}
 
-  virtual ~Codec() {}
+  virtual ~Codec() NOEXCEPT {}
 
   virtual size_t from_bytes(bytes buf, float &val);
   virtual size_t from_bytes(bytes buf, double &val);

cdk/include/mysql/cdk/common.h

@@ -414,7 +414,7 @@ class JSON_processor
   virtual void num(double)        =0;
   virtual void yesno(bool)        =0;
 
-  virtual ~JSON_processor() {}
+  virtual ~JSON_processor() NOEXCEPT {}
 };
 
 typedef api::Doc_base<JSON_processor> JSON;

cdk/include/mysql/cdk/data_source.h

@@ -52,7 +52,7 @@ namespace ds {
 
 struct Attr_processor
 {
-  virtual ~Attr_processor() {}
+  virtual ~Attr_processor() NOEXCEPT {}
   virtual void attr(const string &key, const string &val)=0;
 };
 
@@ -90,7 +90,7 @@ class Options
     }
   }
 
-  virtual ~Options() {}
+  virtual ~Options() NOEXCEPT {}
 
   virtual const string& user() const { return m_usr; }
   virtual const std::string* password() const
@@ -171,7 +171,7 @@ class TCPIP
       throw_error("invalid empty host name");
   }
 
-  virtual ~TCPIP() {}
+  virtual ~TCPIP() NOEXCEPT {}
 
   virtual unsigned short port() const { return m_port; }
   virtual const std::string& host() const { return m_host; }
@@ -346,7 +346,7 @@ class Unix_socket
       throw_error("invalid empty socket path");
   }
 
-  virtual ~Unix_socket() {}
+  virtual ~Unix_socket() NOEXCEPT {}
 
   virtual const std::string& path() const { return m_path; }
 };
@@ -386,7 +386,7 @@ class TCPIP : public cdk::ds::mysqlx::TCPIP
   : cdk::ds::mysqlx::TCPIP(_host, _port)
   {}
 
-  virtual ~TCPIP() {}
+  virtual ~TCPIP() NOEXCEPT {}
 
   typedef ds::Options<Protocol_options> Options;
 };

cdk/include/mysql/cdk/foundation/async.h

@@ -50,7 +50,7 @@ class Async_op_base : nocopy
 {
 public:
 
-  virtual ~Async_op_base() {}
+  virtual ~Async_op_base() NOEXCEPT {}
 
   virtual bool is_completed() const =0;
 

cdk/include/mysql/cdk/foundation/codec.h

@@ -71,7 +71,7 @@ class String_codec
 {
 public:
 
-  virtual ~String_codec() {}
+  virtual ~String_codec() NOEXCEPT {}
 
   //virtual size_t measure(const string&) =0;
   virtual size_t from_bytes(bytes, string&) =0;
@@ -165,7 +165,7 @@ class Number_codec
 {
 public:
 
-  virtual ~Number_codec() {}
+  virtual ~Number_codec() NOEXCEPT {}
 
   virtual size_t from_bytes(bytes buf, int8_t &val)  =0;
   virtual size_t from_bytes(bytes buf, int16_t &val) =0;

cdk/include/mysql/cdk/foundation/connection_tcpip.h

@@ -107,7 +107,7 @@ class IO_error : public Error_class<IO_error>
     : Error_base(NULL, io_error(num))
   {}
 
-  virtual ~IO_error() throw() {}
+  virtual ~IO_error() NOEXCEPT {}
 
 };
 

cdk/include/mysql/cdk/foundation/diagnostics.h

@@ -223,7 +223,7 @@ class Diagnostic_iterator : public api::Diagnostics::Iterator
     : m_entries(NULL), m_level(Severity::ERROR)
   {}
 
-  virtual ~Diagnostic_iterator() {}
+  virtual ~Diagnostic_iterator() NOEXCEPT {}
 
   const Entry& entry()
   {
@@ -265,8 +265,10 @@ class Diagnostic_arena
     : m_it(m_entries, Severity::ERROR)
   {}
 
-  virtual ~Diagnostic_arena()
-  { clear(); }
+  virtual ~Diagnostic_arena() NOEXCEPT
+  {
+    try { clear(); } catch (...) {}
+  }
 
 
   /*

cdk/include/mysql/cdk/foundation/error_category.h

@@ -144,7 +144,7 @@ const error_category& posix_error_category();
   struct error_category_##EC : public cdk::foundation::error_category_base  \
   {                                                                       \
     error_category_##EC() {}                                              \
-    const char* name() const throw() { return "cdk-" #EC; }               \
+    const char* name() const NOEXCEPT { return "cdk-" #EC; }               \
     std::string message(int code) const                                   \
     { CDK_ERROR_SWITCH(NS, EC, code); }                                   \
     cdk::foundation::error_condition do_default_error_condition(int) const;  \

cdk/include/mysql/cdk/foundation/opaque_impl.h

@@ -171,7 +171,7 @@ class opaque_impl
 
 protected:
 
-  virtual ~opaque_impl();
+  virtual ~opaque_impl() NOEXCEPT;
 
   // Default constructor: uses default constructor of internal implementation type.
 

cdk/include/mysql/cdk/foundation/opaque_impl.i

@@ -129,7 +129,7 @@ namespace foundation {
   namespace cdk {                                         \
   namespace foundation {                                  \
     template<>                                            \
-    opaque_impl<X>::~opaque_impl() { delete m_impl; }     \
+    opaque_impl<X>::~opaque_impl() NOEXCEPT { delete m_impl; }     \
   }}  // cdk::foundation
 
 #define IMPL_DEFAULT(X) \

cdk/include/mysql/cdk/foundation/stream.h

@@ -75,7 +75,7 @@ class Connection
   , public Output_stream
 {
 public:
-  virtual ~Connection() {}
+  virtual ~Connection() NOEXCEPT {}
   virtual void connect() =0;
   virtual void close() =0;
   virtual bool is_closed() const =0;

cdk/include/mysql/cdk/foundation/variant.h

@@ -356,9 +356,9 @@ class variant
     return *this;
   }
 
-  ~variant()
+  ~variant() NOEXCEPT
   {
-    Base::destroy();
+    try { Base::destroy(); } catch (...) {}
   }
 
   operator bool()

cdk/include/mysql/cdk/mysqlx/common.h

@@ -95,13 +95,13 @@ class Server_error
 
   typedef protocol::mysqlx::sql_state_t sql_state_t;
 
-  Server_error(unsigned num, sql_state_t, const string& desc = string()) throw()
+  Server_error(unsigned num, sql_state_t, const string& desc = string()) NOEXCEPT
     : Error_base(NULL, server_error(static_cast<int>(num)), desc)
   {
     assert(num < (unsigned)std::numeric_limits<int>::max());
   }
 
-  virtual ~Server_error() throw() {}
+  virtual ~Server_error() NOEXCEPT {}
 
 };
 
@@ -115,7 +115,7 @@ class Server_prepare_error
 
   Server_prepare_error(
     unsigned num, sql_state_t sql_state, const string& desc = string()
-  ) throw()
+  ) NOEXCEPT
     : Error_base(NULL, num, sql_state , desc)
   {}
 };
@@ -128,7 +128,7 @@ class Server_expectation_error
 
   typedef protocol::mysqlx::sql_state_t sql_state_t;
 
-  Server_expectation_error(const string& desc) throw()
+  Server_expectation_error(const string& desc) NOEXCEPT
     : Error_base(NULL, 5168, sql_state_t("HY000") , desc)
   {}
 };

cdk/include/mysql/cdk/mysqlx/result.h

@@ -446,12 +446,21 @@ class Stmt_op
     assert(m_session);
   }
 
-  virtual ~Stmt_op()
+  virtual ~Stmt_op() NOEXCEPT
   {
-    discard();
-    wait();
-    if (m_session)
-      m_session->deregister_stmt(this);
+    try
+    {
+      discard();
+      wait();
+    }
+    catch (...) {}
+
+    try
+    {
+      if (m_session)
+        m_session->deregister_stmt(this);
+    }
+    catch (...) {}
   }
 
   Session& get_session()
@@ -812,7 +821,7 @@ class Cursor
 public:
 
   Cursor(const std::shared_ptr<Stmt_op> &reply);
-  ~Cursor();
+  ~Cursor() NOEXCEPT;
 
   void get_rows(mysqlx::Row_processor& rp);
   void get_rows(mysqlx::Row_processor& rp, row_count_t limit);

cdk/include/mysql/cdk/mysqlx/session.h

@@ -148,7 +148,7 @@ class SessionAuth
 public:
 
   SessionAuth(Session&, const char *method);
-  virtual ~SessionAuth() {}
+  virtual ~SessionAuth() NOEXCEPT {}
 
   /*
     Authentication data to be sent in the AuthenticateStart message,
@@ -294,7 +294,7 @@ class Session
   */
   Compression_type::value negotiate_compression(const std::vector<compression_algorithm_t>& algorithms);
 
-  virtual ~Session();
+  virtual ~Session() NOEXCEPT;
 
   /*
     Check if given session is valid. Function is_valid() performs