[LINT] error 1740

Pointer member 'Symbol' (Location) not directly freed or zero'ed by destructor.

*NOTE of importance to the maintainer*:
There is a very real potential for leaks in MenuManager.cpp, line 605. There
is nothing preventing m_funcItems to be allocated more than once.

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

Author: joce

PythonScript/src/ConsoleDialog.cpp

@@ -34,14 +34,14 @@ ConsoleDialog::ConsoleDialog(const ConsoleDialog& other) :
 	m_hInput(other.m_hInput),
 	m_console(other.m_console),
 	m_prompt(other.m_prompt),
-	m_originalInputWndProc(other.m_originalInputWndProc),
-	m_hTabIcon(other.m_hTabIcon),
+	m_originalInputWndProc(NULL),
+	m_hTabIcon(NULL),
 	m_history(other.m_history),
 	m_historyIter(other.m_historyIter),
 	m_changes(other.m_changes),
 	m_currentHistory(other.m_currentHistory),
 	m_runButtonIsRun(other.m_runButtonIsRun),
-	m_hContext(other.m_hContext)
+	m_hContext(NULL)
 {
 }
 //lint +e1554
@@ -57,7 +57,25 @@ ConsoleDialog::~ConsoleDialog()
 	if (m_data)
 	{
 		delete m_data;
+		m_data = NULL;
+	}
+
+	if (m_hTabIcon)
+	{
+		::DestroyIcon(m_hTabIcon);
+		m_hTabIcon = NULL;
 	}
+
+	if (m_hContext)
+	{
+		::DestroyMenu(m_hContext);
+		m_hContext = NULL;
+	}
+
+	// To please Lint, let's NULL these handles and pointers
+	m_hInput = NULL;
+	m_console = NULL;
+
 }
 
 
@@ -1025,19 +1043,23 @@ bool ConsoleDialog::parsePythonErrorLine(LineDetails *lineDetails)
 
 void ConsoleDialog::onHotspotClick(SCNotification* notification)
 {
-    int lineNumber = callScintilla(SCI_LINEFROMPOSITION, notification->position);
-    LineDetails lineDetails;
-    lineDetails.lineLength = (size_t)callScintilla(SCI_GETLINE, lineNumber);
+	assert(m_console != NULL);
+	if (m_console)
+	{
+		int lineNumber = callScintilla(SCI_LINEFROMPOSITION, notification->position);
+		LineDetails lineDetails;
+		lineDetails.lineLength = (size_t)callScintilla(SCI_GETLINE, lineNumber);
 
-    if (lineDetails.lineLength != SIZE_MAX)
-    {
-        lineDetails.line = new char[lineDetails.lineLength + 1];
-        callScintilla(SCI_GETLINE, lineNumber, reinterpret_cast<LPARAM>(lineDetails.line));
-        lineDetails.line[lineDetails.lineLength] = '\0';
-        if (parseLine(&lineDetails))
-        {
-            lineDetails.line[lineDetails.filenameEnd] = '\0';
-            m_console->openFile(lineDetails.line + lineDetails.filenameStart, lineDetails.errorLineNo);
-        }
-    }
+		if (lineDetails.lineLength != SIZE_MAX)
+		{
+			lineDetails.line = new char[lineDetails.lineLength + 1];
+			callScintilla(SCI_GETLINE, lineNumber, reinterpret_cast<LPARAM>(lineDetails.line));
+			lineDetails.line[lineDetails.lineLength] = '\0';
+			if (parseLine(&lineDetails))
+			{
+				lineDetails.line[lineDetails.filenameEnd] = '\0';
+				m_console->openFile(lineDetails.line + lineDetails.filenameStart, lineDetails.errorLineNo);
+			}
+		}
+	}
 }

PythonScript/src/MenuManager.cpp

@@ -59,6 +59,28 @@ MenuManager::~MenuManager()
 	{
 		// I don't know what to do with that, but a destructor should never throw, so...
 	}
+
+	if (m_pythonPluginMenu)
+	{
+		::DestroyMenu(m_pythonPluginMenu);
+		m_pythonPluginMenu = NULL;
+	}
+
+	if (m_hScriptsMenu)
+	{
+		::DestroyMenu(m_hScriptsMenu);
+		m_hScriptsMenu = NULL;
+	}
+
+	if (m_funcItems)
+	{
+		delete [] m_funcItems;
+		m_funcItems = NULL;
+	}
+
+	// To please Lint, let's NULL these handles and pointers
+	m_hNotepad = NULL;
+	m_hInst = NULL;
 }
 
 MenuManager* MenuManager::getInstance()
@@ -579,6 +601,7 @@ FuncItem* MenuManager::getFuncItemArray(int *nbF, ItemVectorTD items, runScriptI
 
 	m_funcItemCount = (size_t)*nbF;
 
+	// WARNING: If getFuncItemArray is called twice, we'll leak memory!
 	m_funcItems = new FuncItem[m_funcItemCount];
 
 	// Add all the static items passed in

PythonScript/src/NotepadPlusWrapper.cpp

@@ -35,6 +35,10 @@ NotepadPlusWrapper::~NotepadPlusWrapper()
 	{
 		// I don't know what to do with that, but a destructor should never throw, so...
 	}
+
+	// To please Lint, let's NULL these handles and pointers
+	m_nppHandle = NULL;
+	m_hInst = NULL;
 }
 
 void NotepadPlusWrapper::notify(SCNotification *notifyCode)

PythonScript/src/PythonConsole.cpp

@@ -37,7 +37,7 @@ PythonConsole::PythonConsole(const PythonConsole& other) :
 	m_pushFunc(other.m_pushFunc),
 	m_sys(other.m_sys),
 	mp_mainThreadState(other.mp_mainThreadState),
-	m_statementRunning(other.m_statementRunning),
+	m_statementRunning(CreateEvent(NULL, FALSE, TRUE, NULL)),
 	m_hThread(other.m_hThread),
 	m_hNotepad(other.m_hNotepad),
 	m_consumerStarted(other.m_consumerStarted),
@@ -58,6 +58,16 @@ PythonConsole::~PythonConsole()
 	{
 		// I don't know what to do with that, but a destructor should never throw, so...
 	}
+
+	if (m_statementRunning)
+	{
+		CloseHandle(m_statementRunning);
+		m_statementRunning = NULL;
+	}
+
+	// To please Lint, let's NULL these handles and pointers
+	mp_mainThreadState = NULL;
+	m_hNotepad = NULL;
 }
 
 void PythonConsole::init(HINSTANCE hInst, NppData& nppData)