hide more data

microsoft · Dec 20, 2020 · 37c98eb · 37c98eb
1 parent 88c3055
commit 37c98eb
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 15 deletions.
diff --git a/UI/Dialogs/Editors/RestrictEditor.cpp b/UI/Dialogs/Editors/RestrictEditor.cpp
@@ -535,14 +535,15 @@ namespace dialog::editor
 		const auto res = lpData->cast<sortlistdata::resData>();
 		if (!res) return false;
 
-		const auto lpSourceRes = res->m_lpNewRes ? res->m_lpNewRes : res->m_lpOldRes;
+		const auto lpSourceRes = res->getCurrentRes();
 
 		CRestrictEditor MyResEditor(this, m_lpAllocParent,
 									lpSourceRes); // pass source res into editor
 		if (!MyResEditor.DisplayDialog()) return false;
 		// Since lpData->data.Res.lpNewRes was owned by an m_lpAllocParent, we don't free it directly
-		res->m_lpNewRes = MyResEditor.DetachModifiedSRestriction();
-		SetListString(ulListNum, iItem, 1, property::RestrictionToString(res->m_lpNewRes, nullptr));
+		const auto newRes = MyResEditor.DetachModifiedSRestriction();
+		res->setCurrentRes(newRes);
+		SetListString(ulListNum, iItem, 1, property::RestrictionToString(newRes, nullptr));
 		return true;
 	}
 
@@ -565,16 +566,7 @@ namespace dialog::editor
 					const auto res = lpData->cast<sortlistdata::resData>();
 					if (res)
 					{
-						if (res->m_lpNewRes)
-						{
-							memcpy(&lpNewResArray[paneID], res->m_lpNewRes, sizeof(SRestriction));
-							memset(res->m_lpNewRes, 0, sizeof(SRestriction));
-						}
-						else
-						{
-							EC_H_S(mapi::HrCopyRestrictionArray(
-								res->m_lpOldRes, m_lpAllocParent, 1, &lpNewResArray[paneID]));
-						}
+						lpNewResArray[paneID] = res->detachRes(m_lpAllocParent);
 					}
 				}
 			}

diff --git a/core/sortlistdata/binaryData.h b/core/sortlistdata/binaryData.h
@@ -16,11 +16,11 @@ namespace sortlistdata
 		{
 			if (m_NewBin.lpb)
 			{
-				return &m_OldBin;
+				return &m_NewBin;
 			}
 			else
 			{
-				return &m_NewBin;
+				return &m_OldBin;
 			}
 		}
 		void setCurrentBin(_In_ const SBinary& bin) { m_NewBin = bin; }

diff --git a/core/sortlistdata/resData.cpp b/core/sortlistdata/resData.cpp
@@ -1,6 +1,7 @@
 #include <core/stdafx.h>
 #include <core/sortlistdata/resData.h>
 #include <core/sortlistdata/sortListData.h>
+#include <core/utility/error.h>
 
 namespace sortlistdata
 {
@@ -12,4 +13,22 @@ namespace sortlistdata
 	}
 
 	resData::resData(_In_opt_ const _SRestriction* lpOldRes) noexcept : m_lpOldRes(lpOldRes) {}
+
+	_Check_return_ _SRestriction resData::detachRes(_In_opt_ const VOID* parent)
+	{
+		auto ret = _SRestriction{};
+		if (m_lpNewRes)
+		{
+			memcpy(&ret, m_lpNewRes, sizeof(SRestriction));
+			// clear out members so we don't double free
+			memset(m_lpNewRes, 0, sizeof(SRestriction));
+		}
+		else
+		{
+			EC_H_S(mapi::HrCopyRestrictionArray(m_lpOldRes, parent, 1, &ret));
+		}
+
+		return ret;
+	}
+
 } // namespace sortlistdata
diff --git a/core/sortlistdata/resData.h b/core/sortlistdata/resData.h
@@ -12,6 +12,21 @@ namespace sortlistdata
 
 		resData(_In_opt_ const _SRestriction* lpOldRes) noexcept;
 
+		_Check_return_ const _SRestriction* getCurrentRes()
+		{
+			if (m_lpNewRes)
+			{
+				return m_lpNewRes;
+			}
+			else
+			{
+				return m_lpOldRes;
+			}
+		}
+		void setCurrentRes(_In_ _SRestriction* res) { m_lpNewRes = res; }
+		_Check_return_ _SRestriction detachRes(_In_opt_ const VOID* parent);
+
+	private:
 		const _SRestriction* m_lpOldRes{}; // not allocated - just a pointer
 		LPSRestriction m_lpNewRes{}; // Owned by an alloc parent - do not free
 	};