Fixed memory and handle leaks in DirectShow frame grabbers

zenden2k · Nov 4, 2024 · 2a81014 · 2a81014
1 parent d9bb08d
commit 2a81014
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/Source/Video/DirectshowFrameGrabber.cpp b/Source/Video/DirectshowFrameGrabber.cpp
@@ -82,6 +82,12 @@ class CSampleGrabberCB : public ISampleGrabberCB
 		BufferEvent = nullptr;
 		prev = 0;
     }
+
+    ~CSampleGrabberCB() {
+        if (BufferEvent) {
+            CloseHandle(BufferEvent);
+        }
+    }
     std::mutex mutex_;
     DirectshowFrameGrabberPrivate *directShowPrivate;
     //CImgSavingThread* SavingThread;

diff --git a/Source/Video/DirectshowFrameGrabber2.cpp b/Source/Video/DirectshowFrameGrabber2.cpp
@@ -143,7 +143,18 @@ typedef struct tagVIDEOINFOHEADER2
 
 class DirectshowFrameGrabber2Private: public CGrabCallback {
 public:
+    class Initializer {
+    public:
+        Initializer() {
+        }
+
+        ~Initializer() {
+            DbgTerminate();
+        }
+    };
+
     DirectshowFrameGrabber2Private() {
+        static Initializer initializer;
         memset(&vih, 0, sizeof(vih));
     }
 

diff --git a/Source/Video/GrabFilter.cpp b/Source/Video/GrabFilter.cpp
@@ -33,6 +33,7 @@ CGrabFilter::CGrabFilter(LPUNKNOWN pUnk, CGrab* grab) :
 }
 
 CGrabFilter::~CGrabFilter() {
+    delete m_pPosition;
 }
 
 CBasePin * CGrabFilter::GetPin(int n){
@@ -181,4 +182,4 @@ STDMETHODIMP CGrabInputPin::EndOfStream(void) {
 // Called when we are seeked
 STDMETHODIMP CGrabInputPin::NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) {
     return m_pDumpFilter->NewSegment(tStart, tStop, dRate);
-} 
+} 
diff --git a/Source/Video/GrabFilter.h b/Source/Video/GrabFilter.h
@@ -28,7 +28,6 @@ class CGrab
 
 class CGrabFilter : public CBaseFilter
 {
-
     CCritSec m_ReceiveLock;
     bool m_doGrab;
     CGrabCallback* m_callback;
@@ -81,4 +80,4 @@ class CGrabInputPin : public CRenderedInputPin
     STDMETHODIMP NewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) override;
 };
 
-#endif
+#endif