[LINT] error 1579

Pointer member ’Symbol’ (Location) might have been freed by a separate
function but no ’-sem(Name,cleanup)’

Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com>

Author: joce

PythonScript/src/PythonConsole.cpp

@@ -16,7 +16,6 @@
 PythonConsole::PythonConsole(HWND hNotepad) :
 	PyProducerConsumer<std::string>(),
 		mp_scintillaWrapper(new ScintillaWrapper(NULL)),
-		mp_python(NULL),
 		mp_mainThreadState(NULL),
 		m_hThread(NULL),
 		m_hNotepad(hNotepad),
@@ -53,7 +52,6 @@ void PythonConsole::initPython(PythonHandler *pythonHandler)
 {
 	try
 	{
-		mp_python = pythonHandler;
 		mp_mainThreadState = pythonHandler->getMainThreadState();
 
 		PyGILState_STATE gstate = PyGILState_Ensure();

PythonScript/src/PythonConsole.h

@@ -80,7 +80,6 @@ class PythonConsole : public NppPythonScript::PyProducerConsumer<std::string>, p
 	boost::python::object m_console;
 	boost::python::object m_pushFunc;
 	boost::python::object m_sys;
-	PythonHandler* mp_python;
 	PyThreadState* mp_mainThreadState;
 	HANDLE m_statementRunning;
 	HANDLE m_hThread;

PythonScript/src/PythonHandler.cpp

@@ -20,7 +20,6 @@ PythonHandler::PythonHandler(char *pluginsDir, char *configDir, HINSTANCE hInst,
 	  mp_console(pythonConsole),
 	  m_currentView(0),
 	  mp_mainThreadState(NULL),
-	  mp_python(NULL),
 	  m_consumerStarted(false)
 {
 	m_machineBaseDir.append("\\PythonScript\\");
@@ -30,7 +29,6 @@ PythonHandler::PythonHandler(char *pluginsDir, char *configDir, HINSTANCE hInst,
 	mp_scintilla = createScintillaWrapper();
 	mp_scintilla1 = new ScintillaWrapper(scintilla1Handle);
 	mp_scintilla2 = new ScintillaWrapper(scintilla2Handle);
-	
 }
 
 PythonHandler::~PythonHandler(void)
@@ -50,7 +48,21 @@ PythonHandler::~PythonHandler(void)
 
 			// Can't call finalize with boost::python.
 			// Py_Finalize();
+
 		}
+
+		delete mp_scintilla2;
+		delete mp_scintilla1;
+		delete mp_scintilla;
+		delete mp_notepad;
+
+		// To please Lint, let's NULL these handles
+		m_hInst = NULL;
+		m_nppHandle = NULL;
+		m_scintilla1Handle = NULL;
+		m_scintilla2Handle = NULL;
+		mp_console = NULL;
+		mp_mainThreadState = NULL;
 	}
 	catch (...)
 	{

PythonScript/src/PythonHandler.h

@@ -100,11 +100,8 @@ class PythonHandler : public NppPythonScript::PyProducerConsumer<RunScriptArgs>
 	int m_currentView;
 
 	PyThreadState *mp_mainThreadState;
-	PythonHandler *mp_python;
 
 	bool m_consumerStarted;
-	HANDLE m_hKillWait;
-	
 };
 
 #endif