use unique_ptr

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

include/exiv2/value.hpp

@@ -1144,8 +1144,6 @@ class ValueType : public Value {
   explicit ValueType(const T& val, TypeId typeId = getType<T>());
   //! Copy constructor
   ValueType(const ValueType<T>& rhs);
-  //! Virtual destructor.
-  ~ValueType() override;
   //@}
 
   //! @name Manipulators
@@ -1275,7 +1273,7 @@ class ValueType : public Value {
 
   // DATA
   //! Pointer to the buffer, nullptr if none has been allocated
-  byte* pDataArea_{nullptr};
+  std::unique_ptr<byte[]> pDataArea_;
   //! The current size of the buffer
   size_t sizeDataArea_{0};
 };  // class ValueType
@@ -1448,37 +1446,28 @@ ValueType<T>::ValueType(const T& val, TypeId typeId) : Value(typeId) {
 }
 
 template <typename T>
-ValueType<T>::ValueType(const ValueType<T>& rhs) :
-    Value(rhs.typeId()),
-    value_(rhs.value_)
-
-{
+ValueType<T>::ValueType(const ValueType<T>& rhs) : Value(rhs.typeId()), value_(rhs.value_) {
   if (rhs.sizeDataArea_ > 0) {
-    pDataArea_ = new byte[rhs.sizeDataArea_];
-    std::memcpy(pDataArea_, rhs.pDataArea_, rhs.sizeDataArea_);
+    pDataArea_ = std::unique_ptr<byte[]>(new byte[rhs.sizeDataArea_]);
+    std::copy_n(rhs.pDataArea_.get(), rhs.sizeDataArea_, pDataArea_.get());
     sizeDataArea_ = rhs.sizeDataArea_;
   }
 }
 
-template <typename T>
-ValueType<T>::~ValueType() {
-  delete[] pDataArea_;
-}
-
 template <typename T>
 ValueType<T>& ValueType<T>::operator=(const ValueType<T>& rhs) {
   if (this == &rhs)
     return *this;
   value_ = rhs.value_;
 
-  byte* tmp = nullptr;
   if (rhs.sizeDataArea_ > 0) {
-    tmp = new byte[rhs.sizeDataArea_];
-    std::memcpy(tmp, rhs.pDataArea_, rhs.sizeDataArea_);
+    pDataArea_ = std::unique_ptr<byte[]>(new byte[rhs.sizeDataArea_]);
+    std::copy_n(rhs.pDataArea_.get(), rhs.sizeDataArea_, pDataArea_.get());
+    sizeDataArea_ = rhs.sizeDataArea_;
+  } else {
+    pDataArea_ = nullptr;
+    sizeDataArea_ = 0;
   }
-  delete[] pDataArea_;
-  pDataArea_ = tmp;
-  sizeDataArea_ = rhs.sizeDataArea_;
 
   return *this;
 }
@@ -1662,18 +1651,17 @@ size_t ValueType<T>::sizeDataArea() const {
 
 template <typename T>
 DataBuf ValueType<T>::dataArea() const {
-  return {pDataArea_, sizeDataArea_};
+  return {pDataArea_.get(), sizeDataArea_};
 }
 
 template <typename T>
 int ValueType<T>::setDataArea(const byte* buf, size_t len) {
-  byte* tmp = nullptr;
+  std::unique_ptr<byte[]> tmp;
   if (len > 0) {
-    tmp = new byte[len];
-    std::memcpy(tmp, buf, len);
+    tmp = std::unique_ptr<byte[]>(new byte[len]);
+    std::copy_n(buf, len, tmp.get());
   }
-  delete[] pDataArea_;
-  pDataArea_ = tmp;
+  pDataArea_ = std::move(tmp);
   sizeDataArea_ = len;
   return 0;
 }