Deallocate asset data

Author: adazem009

include/scratchcpp/asset.h

@@ -19,7 +19,7 @@ class LIBSCRATCHCPP_EXPORT Asset : public Entity
         Asset(const std::string &name, const std::string &id, const std::string &format);
         Asset(const Asset &) = delete;
 
-        virtual ~Asset() { }
+        virtual ~Asset();
 
         void setId(const std::string &id);
 

src/project_p.cpp

@@ -121,7 +121,9 @@ bool ProjectPrivate::tryLoad(IProjectReader *reader)
         // Load asset data
         for (size_t i = 0; i < assets.size(); i++) {
             const std::string &data = assetData[i];
-            assets[assetNames[i]]->setData(data.size(), static_cast<void *>(const_cast<char *>(data.c_str())));
+            char *ptr = (char *)malloc(data.size() * sizeof(char));
+            strncpy(ptr, data.data(), data.size());
+            assets[assetNames[i]]->setData(data.size(), ptr);
         }
 
     } else {

src/scratch/asset.cpp

@@ -14,6 +14,15 @@ Asset::Asset(const std::string &name, const std::string &id, const std::string &
     impl->updateFileName(id);
 }
 
+/*! Destroys Asset. */
+Asset::~Asset()
+{
+    if (impl->data) {
+        free(impl->data);
+        impl->data = nullptr;
+    }
+}
+
 /*! Sets the ID (MD5 hash) of the asset file. */
 void Asset::setId(const std::string &id)
 {
@@ -51,9 +60,12 @@ unsigned int Asset::dataSize() const
     return impl->dataSize;
 }
 
-/*! Sets the asset data. */
+/*! Sets the asset data (will be deallocated when the object is destroyed). */
 void Asset::setData(unsigned int size, void *data)
 {
+    if (impl->data)
+        free(impl->data);
+
     impl->dataSize = size;
     impl->data = data;
     processData(size, data);

src/scratch/asset_p.h

@@ -19,7 +19,7 @@ struct AssetPrivate
         std::string name;
         std::string dataFormat;
         std::string fileName;
-        const void *data = nullptr;
+        void *data = nullptr;
         unsigned int dataSize = 0;
         Target *target = nullptr;
 };

test/assets/asset_test.cpp

@@ -29,12 +29,24 @@ TEST(AssetTest, Data)
     TestAsset asset;
     ASSERT_EQ(asset.data(), nullptr);
 
-    static char data[5] = "abcd";
+    char *data = (char *)malloc(4 * sizeof(char));
+    strncpy(data, "abcd", 4);
+
     asset.setData(5, data);
     ASSERT_EQ(asset.data(), data);
     ASSERT_EQ(asset.size, 5);
     ASSERT_EQ(asset.processedData, data);
     ASSERT_EQ(asset.callCount, 1);
+
+    // Should deallocate in setData()
+    data = (char *)malloc(11 * sizeof(char));
+    strncpy(data, "Hello world!", 11);
+
+    asset.setData(5, data);
+    ASSERT_EQ(asset.data(), data);
+    ASSERT_EQ(asset.size, 5);
+    ASSERT_EQ(asset.processedData, data);
+    ASSERT_EQ(asset.callCount, 2);
 }
 
 TEST(AssetTest, Target)

test/assets/sound_test.cpp

@@ -59,16 +59,20 @@ TEST_F(SoundTest, ProcessData)
     Sound sound("sound1", "a", "wav");
     sound.setRate(44100);
 
-    const char *data = "abc";
-    void *dataPtr = const_cast<void *>(static_cast<const void *>(data));
+    char *data = (char *)malloc(4 * sizeof(char));
+    strncpy(data, "abcd", 4);
 
     EXPECT_CALL(*m_player, isLoaded()).WillOnce(Return(false));
-    EXPECT_CALL(*m_player, load(3, dataPtr, 44100)).WillOnce(Return(true));
-    sound.setData(3, dataPtr);
+    EXPECT_CALL(*m_player, load(3, data, 44100)).WillOnce(Return(true));
+    sound.setData(3, data);
+
+    // Should deallocate in setData()
+    data = (char *)malloc(11 * sizeof(char));
+    strncpy(data, "Hello world!", 11);
 
     EXPECT_CALL(*m_player, isLoaded()).WillOnce(Return(true));
     EXPECT_CALL(*m_player, load).Times(0);
-    sound.setData(3, dataPtr);
+    sound.setData(3, data);
 }
 
 TEST_F(SoundTest, SetVolume)
@@ -151,12 +155,12 @@ TEST_F(SoundTest, Clone)
     sound->setRate(44100);
     sound->setSampleCount(10000);
 
-    const char *data = "abc";
-    void *dataPtr = const_cast<void *>(static_cast<const void *>(data));
+    char *data = (char *)malloc(4 * sizeof(char));
+    strncpy(data, "abcd", 4);
 
     EXPECT_CALL(*m_player, isLoaded()).WillOnce(Return(false));
-    EXPECT_CALL(*m_player, load(3, dataPtr, 44100)).WillOnce(Return(true));
-    sound->setData(3, dataPtr);
+    EXPECT_CALL(*m_player, load(3, data, 44100)).WillOnce(Return(true));
+    sound->setData(3, data);
 
     auto clonePlayer = std::make_shared<AudioPlayerMock>();
     EXPECT_CALL(m_playerFactory, createAudioPlayer()).WillOnce(Return(clonePlayer));