Fix: Remove invalid uses of copy_cast<> for libuv pointer aliasing

Author: mpenick

src/async_queue.hpp

@@ -17,8 +17,6 @@
 #ifndef __CASS_ASYNC_QUEUE_HPP_INCLUDED__
 #define __CASS_ASYNC_QUEUE_HPP_INCLUDED__
 
-#include "utils.hpp"
-
 #include <uv.h>
 
 namespace cass {
@@ -35,7 +33,7 @@ class AsyncQueue {
   }
 
   void close_handles() {
-    uv_close(copy_cast<uv_async_t*, uv_handle_t*>(&async_), NULL);
+    uv_close(reinterpret_cast<uv_handle_t*>(&async_), NULL);
   }
 
   void send() {

src/connection.cpp

@@ -34,7 +34,6 @@
 #include "error_response.hpp"
 #include "event_response.hpp"
 #include "logger.hpp"
-#include "utils.hpp"
 
 #ifdef HAVE_NOSIGPIPE
 #include <sys/socket.h>
@@ -344,14 +343,14 @@ void Connection::internal_close(ConnectionState close_state) {
 
   if (state_ != CONNECTION_STATE_CLOSE &&
       state_ != CONNECTION_STATE_CLOSE_DEFUNCT) {
-    uv_handle_t* handle = copy_cast<uv_tcp_t*, uv_handle_t*>(&socket_);
+    uv_handle_t* handle = reinterpret_cast<uv_handle_t*>(&socket_);
     if (!uv_is_closing(handle)) {
       heartbeat_timer_.stop();
       terminate_timer_.stop();
       connect_timer_.stop();
       if (state_ == CONNECTION_STATE_CONNECTED ||
           state_ == CONNECTION_STATE_READY) {
-        uv_read_stop(copy_cast<uv_tcp_t*, uv_stream_t*>(&socket_));
+        uv_read_stop(reinterpret_cast<uv_stream_t*>(&socket_));
       }
       set_state(close_state);
       uv_close(handle, on_close);
@@ -530,23 +529,23 @@ void Connection::on_connect(Connector* connector) {
               connection->host_->address_string().c_str(),
               static_cast<void*>(connection));
 
-#ifdef HAVE_NOSIGPIPE
+#if defined(HAVE_NOSIGPIPE) && UV_VERSION_MAJOR >= 1
     // This must be done after connection for the socket file descriptor to be
     // valid.
     uv_os_fd_t fd = 0;
     int enabled = 1;
-    if (uv_fileno(copy_cast<uv_tcp_t*, uv_handle_t*>(&connection->socket_), &fd) != 0 ||
+    if (uv_fileno(reinterpret_cast<uv_handle_t*>(&connection->socket_), &fd) != 0 ||
         setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&enabled, sizeof(int)) != 0) {
       LOG_WARN("Unable to set socket option SO_NOSIGPIPE for host %s",
                connection->host_->address_string().c_str());
     }
 #endif
 
     if (connection->ssl_session_) {
-      uv_read_start(copy_cast<uv_tcp_t*, uv_stream_t*>(&connection->socket_),
+      uv_read_start(reinterpret_cast<uv_stream_t*>(&connection->socket_),
                     Connection::alloc_buffer_ssl, Connection::on_read_ssl);
     } else {
-      uv_read_start(copy_cast<uv_tcp_t*, uv_stream_t*>(&connection->socket_),
+      uv_read_start(reinterpret_cast<uv_stream_t*>(&connection->socket_),
                     Connection::alloc_buffer, Connection::on_read);
     }
 
@@ -1036,7 +1035,7 @@ void Connection::PendingWrite::flush() {
     }
 
     is_flushed_ = true;
-    uv_stream_t* sock_stream = copy_cast<uv_tcp_t*, uv_stream_t*>(&connection_->socket_);
+    uv_stream_t* sock_stream = reinterpret_cast<uv_stream_t*>(&connection_->socket_);
     uv_write(&req_, sock_stream, bufs.data(), bufs.size(), PendingWrite::on_write);
   }
 }
@@ -1106,7 +1105,7 @@ void Connection::PendingWriteSsl::flush() {
 
     LOG_TRACE("Sending %u encrypted bytes", static_cast<unsigned int>(encrypted_size_));
 
-    uv_stream_t* sock_stream = copy_cast<uv_tcp_t*, uv_stream_t*>(&connection_->socket_);
+    uv_stream_t* sock_stream = reinterpret_cast<uv_stream_t*>(&connection_->socket_);
     uv_write(&req_, sock_stream, bufs.data(), bufs.size(), PendingWriteSsl::on_write);
 
     is_flushed_ = true;
@@ -1123,7 +1122,7 @@ void Connection::PendingWriteSsl::on_write(uv_write_t* req, int status) {
 
 bool Connection::SslHandshakeWriter::write(Connection* connection, char* buf, size_t buf_size) {
   SslHandshakeWriter* writer = new SslHandshakeWriter(connection, buf, buf_size);
-  uv_stream_t* stream = copy_cast<uv_tcp_t*, uv_stream_t*>(&connection->socket_);
+  uv_stream_t* stream = reinterpret_cast<uv_stream_t*>(&connection->socket_);
 
   int rc = uv_write(&writer->req_, stream, &writer->uv_buf_, 1, SslHandshakeWriter::on_write);
   if (rc != 0) {

src/io_worker.cpp

@@ -244,7 +244,7 @@ void IOWorker::close_handles() {
   EventThread<IOWorkerEvent>::close_handles();
   request_queue_.close_handles();
   uv_prepare_stop(&prepare_);
-  uv_close(copy_cast<uv_prepare_t*, uv_handle_t*>(&prepare_), NULL);
+  uv_close(reinterpret_cast<uv_handle_t*>(&prepare_), NULL);
 }
 
 void IOWorker::on_event(const IOWorkerEvent& event) {

src/loop_thread.hpp

@@ -92,7 +92,7 @@ class LoopThread {
   void close_handles() {
 #if defined(HAVE_SIGTIMEDWAIT) && !defined(HAVE_NOSIGPIPE)
     uv_prepare_stop(&prepare_);
-    uv_close(copy_cast<uv_prepare_t*, uv_handle_t*>(&prepare_), NULL);
+    uv_close(reinterpret_cast<uv_handle_t*>(&prepare_), NULL);
 #endif
   }
 

src/mpmc_queue.hpp

@@ -24,8 +24,8 @@
 
 #include "atomic.hpp"
 #include "cassconfig.hpp"
-#include "utils.hpp"
 #include "macros.hpp"
+#include "utils.hpp"
 
 #include <assert.h>
 

src/periodic_task.hpp

@@ -46,7 +46,7 @@ class PeriodicTask : public RefCounted<PeriodicTask> {
 
 private:
   static void close(PeriodicTask* task) {
-    uv_close(copy_cast<uv_timer_t*, uv_handle_t*>(&task->timer_handle_), on_close);
+    uv_close(reinterpret_cast<uv_handle_t*>(&task->timer_handle_), on_close);
   }
 
 #if UV_VERSION_MAJOR == 0

src/resolver.hpp

@@ -26,7 +26,6 @@
 #include "address.hpp"
 #include "ref_counted.hpp"
 #include "timer.hpp"
-#include "utils.hpp"
 
 namespace cass {
 
@@ -100,7 +99,7 @@ class Resolver {
   static void on_timeout(Timer* timer) {
     Resolver* resolver = static_cast<Resolver*>(timer->data());
     resolver->status_ = FAILED_TIMED_OUT;
-    uv_cancel(copy_cast<uv_getaddrinfo_t*, uv_req_t*>(&resolver->req_));
+    uv_cancel(reinterpret_cast<uv_req_t*>(&resolver->req_));
   }
 
 private:
@@ -208,7 +207,7 @@ class NameResolver {
   static void on_timeout(Timer* timer) {
     NameResolver* resolver = static_cast<NameResolver*>(timer->data());
     resolver->status_ = FAILED_TIMED_OUT;
-    uv_cancel(copy_cast<uv_getnameinfo_t*, uv_req_t*>(&resolver->req_));
+    uv_cancel(reinterpret_cast<uv_req_t*>(&resolver->req_));
   }
 
 private:

src/spsc_queue.hpp

@@ -31,8 +31,8 @@
 
 #include "atomic.hpp"
 #include "cassconfig.hpp"
-#include "utils.hpp"
 #include "macros.hpp"
+#include "utils.hpp"
 
 namespace cass {
 

src/timer.hpp

@@ -18,7 +18,6 @@
 #define __CASS_TIMER_HPP_INCLUDED__
 
 #include "macros.hpp"
-#include "utils.hpp"
 
 #include <uv.h>
 
@@ -40,7 +39,7 @@ class Timer {
 
   bool is_running() const {
     if (handle_ == NULL) return false;
-    return uv_is_active(copy_cast<uv_timer_t*, uv_handle_t*>(handle_)) != 0;
+    return uv_is_active(reinterpret_cast<uv_handle_t*>(handle_)) != 0;
   }
 
   void start(uv_loop_t* loop, uint64_t timeout, void* data,
@@ -58,7 +57,7 @@ class Timer {
   void stop() {
     if (handle_ == NULL) return;
     // This also stops the timer
-    uv_close(copy_cast<uv_timer_t*, uv_handle_t*>(handle_), on_close);
+    uv_close(reinterpret_cast<uv_handle_t*>(handle_), on_close);
     handle_ = NULL;
   }
 
@@ -78,7 +77,7 @@ class Timer {
   }
 
   static void on_close(uv_handle_t* handle) {
-    delete copy_cast<uv_handle_t*, uv_timer_t*>(handle);
+    delete reinterpret_cast<uv_timer_t*>(handle);
   }
 
 private: