Fix allocation issues.

src/s3plugin.cpp

@@ -794,6 +794,8 @@ int driver_disconnect()
 	active_writer_handles.clear();
 	active_reader_handles.clear();
 
+	client.reset();
+
 	ShutdownAPI(options);
 
 	bIsConnected = kFalse;
@@ -1514,7 +1516,7 @@ long long int driver_fwrite(const void* ptr, size_t size, size_t count, void* st
 	// copy up to capacity for now
 	size_t remain = to_write;
 	size_t copy_count = buffer.capacity() - buffer.size();
-	const unsigned char* ptr_cast_pos = static_cast<const unsigned char*>(ptr);
+	const unsigned char* ptr_cast_pos = reinterpret_cast<const unsigned char*>(ptr);
 
 	auto copy_and_update =
 	    [](Aws::Vector<unsigned char>& dest, const unsigned char** src_start, size_t& count, size_t& remain)

test/basic_test.cpp

@@ -374,12 +374,12 @@ class S3DriverTestFixture : public ::testing::Test {
 
 public:
   // Note: a bit of "rodeo" here: the driver state contains a
-  // unique_ptr<S3Client> that will be set by the test SetUp and unset by the
-  // test TearDown. We can't just pass a pointer owned by a shared_ptr, there
-  // would be conflicts when freeing the associated memory. So, for each test,
-  // the fixture passes a raw pointer to the driver state for it to own. All is
-  // well as long as gtest runs the tests sequentially, otherwise the whole
-  // thing blows up.
+  // Aws::UniquePtr<S3Client> that will be set by the test SetUp and
+  // unset by the test TearDown. We can't just pass a pointer owned by a
+  // shared_ptr, there would be conflicts when freeing the associated memory.
+  // So, for each test, the fixture passes a raw pointer to the driver state for
+  // it to own. All is well as long as gtest runs the tests sequentially,
+  // otherwise the whole thing blows up.
   MockS3Client *mock_client_ = nullptr; // avoid repeated casts by casting once
                                         // in setup. not owning, do not free!