Update self-referential owner ptr when moving SoundStream

src/SFML/Audio/SoundStream.cpp

@@ -45,6 +45,10 @@ namespace sf
 {
 struct SoundStream::Impl : priv::MiniaudioUtils::SoundBase
 {
+    // Memory stability required for self-referential owner pointer.
+    Impl(const Impl&) = delete;
+    Impl(Impl&&)      = delete;
+
     Impl(SoundStream* ownerPtr) :
     SoundBase(vtable, [](void* ptr) { static_cast<Impl*>(ptr)->initialize(); }),
     owner(ownerPtr)
@@ -210,8 +214,7 @@ struct SoundStream::Impl : priv::MiniaudioUtils::SoundBase
     ////////////////////////////////////////////////////////////
     // Member data
     ////////////////////////////////////////////////////////////
-    static constexpr ma_data_source_vtable vtable{read, seek, getFormat, getCursor, getLength, setLooping, /* flags */ 0};
-    SoundStream* const                     owner;        //!< Owning SoundStream object
+    SoundStream*                           owner;        //!< Owning SoundStream object
     std::vector<std::int16_t>              sampleBuffer; //!< Our temporary sample buffer
     std::size_t               sampleBufferCursor{};      //!< The current read position in the temporary sample buffer
     std::uint64_t             samplesProcessed{};        //!< Number of samples processed since beginning of the stream
@@ -234,11 +237,26 @@ SoundStream::~SoundStream() = default;
 
 
 ////////////////////////////////////////////////////////////
-SoundStream::SoundStream(SoundStream&&) noexcept = default;
+SoundStream::SoundStream(SoundStream&& rhs) noexcept : m_impl(std::move(rhs.m_impl))
+{
+    // Update self-referential owner pointer.
+    m_impl->owner = this;
+}
 
 
 ////////////////////////////////////////////////////////////
-SoundStream& SoundStream::operator=(SoundStream&&) noexcept = default;
+SoundStream& SoundStream::operator=(SoundStream&& rhs) noexcept
+{
+    if (this != &rhs)
+    {
+        m_impl = std::move(rhs.m_impl);
+
+        // Update self-referential owner pointer.
+        m_impl->owner = this;
+    }
+
+    return *this;
+}
 
 
 ////////////////////////////////////////////////////////////