avoid manual memory allocation

2 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/SW602MemoryStream.cpp b/src/lib/SW602MemoryStream.cpp
index c10faf0..5eb2a69 100644
--- a/src/lib/SW602MemoryStream.cpp
+++ b/src/lib/SW602MemoryStream.cpp
@@ -15,18 +15,15 @@ namespace libsw602
 {
 
 SW602MemoryStream::SW602MemoryStream(const unsigned char *data, unsigned length)
-  : m_data(0)
+  : m_data(new unsigned char[length])
   , m_length(length)
   , m_pos(0)
 {
-  unsigned char *buffer = new unsigned char[length];
-  std::copy(data, data + length, buffer);
-  m_data = buffer;
+  std::copy(data, data + length, m_data.get());
 }
 
 SW602MemoryStream::~SW602MemoryStream()
 {
-  delete[] m_data;
 }
 
 bool SW602MemoryStream::isStructured()
@@ -73,7 +70,7 @@ const unsigned char *SW602MemoryStream::read(unsigned long numBytes, unsigned lo
   m_pos += numBytes;
 
   numBytesRead = numBytes;
-  return m_data + oldPos;
+  return m_data.get() + oldPos;
 }
 
 int SW602MemoryStream::seek(const long offset, librevenge::RVNG_SEEK_TYPE seekType)
diff --git a/src/lib/SW602MemoryStream.h b/src/lib/SW602MemoryStream.h
index e422c7f..f4dcf54 100644
--- a/src/lib/SW602MemoryStream.h
+++ b/src/lib/SW602MemoryStream.h
@@ -10,6 +10,8 @@
 #ifndef INCLUDED_SW602MEMORYSTREAM_H
 #define INCLUDED_SW602MEMORYSTREAM_H
 
+#include <memory>
+
 #include <librevenge-stream/librevenge-stream.h>
 
 namespace libsw602
@@ -38,7 +40,7 @@ public:
   virtual bool isEnd();
 
 private:
-  const unsigned char *m_data;
+  const std::unique_ptr<unsigned char> m_data;
   const long m_length;
   long m_pos;
 };