Fix #1596 by making memory management more robust

[pulseview.git] / pv / data / logicsegment.hpp

diff --git a/pv/data/logicsegment.hpp b/pv/data/logicsegment.hpp
index 67959b31ec17e402bca93466249355fd60cc5ea4..2e37ed2d248df56c22d1e0d1cd703d7835425fcb 100644 (file)
--- a/pv/data/logicsegment.hpp
+++ b/pv/data/logicsegment.hpp
@@ -22,11 +22,11 @@
 
 #include "segment.hpp"
 
-#include <utility>
 #include <vector>
 
 #include <QObject>
 
+using std::enable_shared_from_this;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -48,7 +48,7 @@ namespace data {
 
 class Logic;
 
-class LogicSegment : public Segment
+class LogicSegment : public Segment, public enable_shared_from_this<Segment>
 {
        Q_OBJECT
 
@@ -75,6 +75,14 @@ public:
 
        virtual ~LogicSegment();
 
+       /**
+        * Using enable_shared_from_this prevents the normal use of shared_ptr
+        * instances by users of LogicSegment instances. Instead, shared_ptrs may
+        * only be created by the instance itself.
+        * See https://en.cppreference.com/w/cpp/memory/enable_shared_from_this
+        */
+       shared_ptr<const LogicSegment> get_shared_ptr() const;
+
        void append_payload(shared_ptr<sigrok::Logic> logic);
        void append_payload(void *data, uint64_t data_size);