Detect use-after-free in debug mode

d-frey · d-frey · commit abe5c8f8abe8 · 2016-11-06T12:27:37.000+01:00
diff --git a/include/tao/json/value.hh b/include/tao/json/value.hh
@@ -106,7 +106,7 @@ namespace tao
                Traits< D >::assign( *this, std::forward< T >( v ) );
             }
             catch( ... ) {
-               unsafe_discard();
+               discard();
                internal::rethrow();
             }
          }
@@ -117,7 +117,7 @@ namespace tao
                unsafe_assign( std::move( l ) );
             }
             catch( ... ) {
-               unsafe_discard();
+               discard();
                throw;
             }
          }
@@ -128,7 +128,7 @@ namespace tao
                unsafe_assign( l );
             }
             catch( ... ) {
-               unsafe_discard();
+               discard();
                throw;
             }
          }
@@ -140,6 +140,7 @@ namespace tao
          ~basic_value() noexcept
          {
             unsafe_discard();
+            assert( ( m_type = json::type::DISCARDED, true ) );
          }
 
          static basic_value array( std::initializer_list< single< Traits > > && l )

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ namespace tao`
`106`	`106`	`Traits< D >::assign( *this, std::forward< T >( v ) );`
`107`	`107`	`}`
`108`	`108`	`catch( ... ) {`
`109`		`- unsafe_discard();`
	`109`	`+ discard();`
`110`	`110`	`internal::rethrow();`
`111`	`111`	`}`
`112`	`112`	`}`
`@@ -117,7 +117,7 @@ namespace tao`
`117`	`117`	`unsafe_assign( std::move( l ) );`
`118`	`118`	`}`
`119`	`119`	`catch( ... ) {`
`120`		`- unsafe_discard();`
	`120`	`+ discard();`
`121`	`121`	`throw;`
`122`	`122`	`}`
`123`	`123`	`}`
`@@ -128,7 +128,7 @@ namespace tao`
`128`	`128`	`unsafe_assign( l );`
`129`	`129`	`}`
`130`	`130`	`catch( ... ) {`
`131`		`- unsafe_discard();`
	`131`	`+ discard();`
`132`	`132`	`throw;`
`133`	`133`	`}`
`134`	`134`	`}`
`@@ -140,6 +140,7 @@ namespace tao`
`140`	`140`	`~basic_value() noexcept`
`141`	`141`	`{`
`142`	`142`	`unsafe_discard();`
	`143`	`+ assert( ( m_type = json::type::DISCARDED, true ) );`
`143`	`144`	`}`
`144`	`145`
`145`	`146`	`static basic_value array( std::initializer_list< single< Traits > > && l )`