Fix memory leak

Author: SinghRajenM

src/NppJsonViewer/JsonViewDlg.cpp

@@ -901,20 +901,6 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)
     if (!lpnmh || lpnmh->idFrom != IDC_TREE)
         return;    // Not click inside JsonTree
 
-    auto GetNodePosition = [this](HTREEITEM hItem)
-    {
-        Position* pPosition = nullptr;
-        if (hItem != nullptr)
-        {
-            LPARAM nodePos = m_hTreeView->GetNodePos(hItem);
-            if (nodePos != -1)
-            {
-                pPosition = reinterpret_cast<Position*>(nodePos);
-            }
-        }
-        return pPosition;
-    };
-
     switch (lpnmh->code)
     {
     case TVN_SELCHANGED:
@@ -925,7 +911,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)
         {
             UpdateNodePath(hItem);
 
-            auto pPosition = GetNodePosition(hItem);
+            auto pPosition = m_hTreeView->GetNodePosition(hItem);
             if (pPosition != nullptr)
             {
                 GoToLine(pPosition->nLine);
@@ -938,7 +924,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)
     {
         HTREEITEM hItem = m_hTreeView->GetSelection();
 
-        auto pPosition = GetNodePosition(hItem);
+        auto pPosition = m_hTreeView->GetNodePosition(hItem);
         if (pPosition != nullptr)
         {
             GoToPosition(pPosition->nLine, pPosition->nColumn);

src/NppJsonViewer/TreeViewCtrl.cpp

@@ -1,7 +1,8 @@
+#include <memory>
+
 #include "TreeViewCtrl.h"
 #include "Define.h"
 #include "resource.h"
-#include <memory>
 
 
 void TreeViewCtrl::OnInit(HWND hParent)
@@ -280,6 +281,20 @@ auto TreeViewCtrl::GetNodePath(HTREEITEM hti) const -> std::wstring
     return wstrJsonPath;
 }
 
+auto TreeViewCtrl::GetNodePosition(HTREEITEM hti) const -> Position*
+{
+    Position* pPosition = nullptr;
+    if (hti != nullptr)
+    {
+        LPARAM nodePos = GetNodePos(hti);
+        if (nodePos != -1)
+        {
+            pPosition = reinterpret_cast<Position*>(nodePos);
+        }
+    }
+    return pPosition;
+}
+
 HTREEITEM TreeViewCtrl::GetSelection() const
 {
     return TreeView_GetSelection(m_hTree);
@@ -357,18 +372,11 @@ void TreeViewCtrl::FreeNodeData(HTREEITEM hItem)
     if (hItem == nullptr)
         return;
 
-    TVITEM tvi {};
-    tvi.hItem = hItem;
-    tvi.mask  = TVIF_PARAM;
-
-    if (SendDlgItemMessage(m_hParent, IDC_TREE, TVM_GETITEM, 0, reinterpret_cast<LPARAM>(&tvi)))
+    Position* pNodeKeyPos = GetNodePosition(hItem);
+    if (pNodeKeyPos)
     {
-        /*JsonLastKey *pLastKey = reinterpret_cast<JsonLastKey *>(tvi.lParam);
-        if (pLastKey)
-        {
-            delete pLastKey;
-            pLastKey = nullptr;
-        }*/
+        delete pNodeKeyPos;
+        pNodeKeyPos = nullptr;
     }
 
     HTREEITEM hChild = TreeView_GetChild(m_hTree, hItem);

src/NppJsonViewer/TreeViewCtrl.h

@@ -1,7 +1,11 @@
 #pragma once
+
+#include <string>
+
 #include <Windows.h>
 #include <CommCtrl.h>
-#include <string>
+
+#include "JsonNode.h"
 
 class TreeViewCtrl
 {
@@ -56,6 +60,7 @@ class TreeViewCtrl
     auto GetNodeKey(HTREEITEM hti) const -> std::wstring;
     auto GetNodeValue(HTREEITEM hti) const -> std::wstring;
     auto GetNodePath(HTREEITEM hti) const -> std::wstring;
+    auto GetNodePosition(HTREEITEM hti) const -> Position*;
 
 private:
     void ExpandOrCollapse(HTREEITEM node, UINT_PTR code) const;