use std::make_unique() for out-of-bound read test and exception safety (

#113)
minio · Mar 13, 2024 · 009f2f5 · 009f2f5
1 parent 4de2f19
commit 009f2f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/client.cc b/src/client.cc
@@ -683,16 +683,11 @@ minio::s3::PutObjectResponse minio::s3::Client::PutObject(PutObjectArgs args) {
         "SSE operation must be performed over a secure connection");
   }
 
-  char* buf = NULL;
-  if (args.part_count > 0) {
-    buf = new char[args.part_size];
-  } else {
-    buf = new char[args.part_size + 1];
-  }
-
   std::string upload_id;
-  PutObjectResponse resp = PutObject(args, upload_id, buf);
-  delete[] buf;
+  auto buf = std::make_unique<char[]>(
+      (args.part_count > 0) ? args.part_size : args.part_size + 1);
+  PutObjectResponse resp = PutObject(args, upload_id, buf.get());
+  buf.reset();
 
   if (!resp && !upload_id.empty()) {
     AbortMultipartUploadArgs amu_args;

diff --git a/tests/tests.cc b/tests/tests.cc
@@ -38,7 +38,8 @@ class RandomBuf : public std::streambuf {
     if (size_ == 0) return EOF;
 
     size_t size = std::min<size_t>(size_, buf_.size());
-    setg(&buf_[0], &buf_[0], &buf_[size]);
+    auto* const data = buf_.data();
+    setg(data, data, data + size);
     for (size_t i = 0; i < size; ++i) buf_[i] = charset[pick(rg)];
     size_ -= size;
     return 0;