From 9c6f642e4c854f1302be474393232966663d7504 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <github@kayari.org>
Date: Thu, 18 Feb 2021 17:10:07 +0000
Subject: [PATCH] Fix memory leaks

Use std::unique_ptr for dynamically-allocated objects.
---
 src/scsi2sd-util6/BoardPanel.hh  | 3 ++-
 src/scsi2sd-util6/TargetPanel.hh | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/scsi2sd-util6/BoardPanel.hh b/src/scsi2sd-util6/BoardPanel.hh
index a21680cd..5969f739 100644
--- a/src/scsi2sd-util6/BoardPanel.hh
+++ b/src/scsi2sd-util6/BoardPanel.hh
@@ -35,6 +35,7 @@
 #endif
 
 #include <utility>
+#include <memory>
 
 namespace SCSI2SD
 {
@@ -76,7 +77,7 @@ private:
 	wxCheckBox* myMapLunsCtrl;
 	wxCheckBox* myBlindWriteCtrl;
 
-	wxIntegerValidator<uint8_t>* myDelayValidator;
+	std::unique_ptr<wxIntegerValidator<uint8_t>> myDelayValidator;
 	wxTextCtrl* myStartDelayCtrl;
 	wxTextCtrl* mySelDelayCtrl;
 
diff --git a/src/scsi2sd-util6/TargetPanel.hh b/src/scsi2sd-util6/TargetPanel.hh
index afaaae22..f26aa323 100644
--- a/src/scsi2sd-util6/TargetPanel.hh
+++ b/src/scsi2sd-util6/TargetPanel.hh
@@ -35,6 +35,7 @@
 #endif
 
 #include <utility>
+#include <memory>
 
 namespace SCSI2SD
 {
@@ -108,20 +109,20 @@ private:
 
 	wxChoice* myDeviceTypeCtrl;
 
-	wxIntegerValidator<uint32_t>* myStartSDSectorValidator;
+	std::unique_ptr<wxIntegerValidator<uint32_t>> myStartSDSectorValidator;
 	wxTextCtrl* myStartSDSectorCtrl;
 	wxCheckBox* myAutoStartSectorCtrl;
 	wxStaticText* myStartSDSectorMsg;
 
-	wxIntegerValidator<uint16_t>* mySectorSizeValidator;
+	std::unique_ptr<wxIntegerValidator<uint16_t>> mySectorSizeValidator;
 	wxTextCtrl* mySectorSizeCtrl;
 	wxStaticText* mySectorSizeMsg;
 
-	wxIntegerValidator<uint32_t>* myNumSectorValidator;
+	std::unique_ptr<wxIntegerValidator<uint32_t>> myNumSectorValidator;
 	wxTextCtrl* myNumSectorCtrl;
 	wxStaticText* myNumSectorMsg;
 
-	wxFloatingPointValidator<float>* mySizeValidator;
+	std::unique_ptr<wxFloatingPointValidator<float>> mySizeValidator;
 	wxTextCtrl* mySizeCtrl;
 	wxChoice* mySizeUnitCtrl;
 
-- 
2.38.5