Harden put functions against misuse (#986)

kennykerr · web-flow · commit 00bc3b8f5937 · 2021-07-21T15:47:20.000-07:00
diff --git a/strings/base_com_ptr.h b/strings/base_com_ptr.h
@@ -111,7 +111,7 @@ WINRT_EXPORT namespace winrt
 
         type** put() noexcept
         {
-            WINRT_ASSERT(m_ptr == nullptr);
+            release_ref();
             return &m_ptr;
         }
 
diff --git a/strings/base_handle.h b/strings/base_handle.h
@@ -52,7 +52,7 @@ WINRT_EXPORT namespace winrt
 
         type* put() noexcept
         {
-            WINRT_ASSERT(m_value == T::invalid());
+            close();
             return &m_value;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ WINRT_EXPORT namespace winrt`
`111`	`111`
`112`	`112`	`type** put() noexcept`
`113`	`113`	`{`
`114`		`- WINRT_ASSERT(m_ptr == nullptr);`
	`114`	`+ release_ref();`
`115`	`115`	`return &m_ptr;`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ WINRT_EXPORT namespace winrt`
`52`	`52`
`53`	`53`	`type* put() noexcept`
`54`	`54`	`{`
`55`		`- WINRT_ASSERT(m_value == T::invalid());`
	`55`	`+ close();`
`56`	`56`	`return &m_value;`
`57`	`57`	`}`
`58`	`58`