Commit bde4f0ba authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Hack to get the leaked object tree back

parent f681b223
...@@ -1134,6 +1134,12 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc ) ...@@ -1134,6 +1134,12 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
vlc_mutex_destroy( &priv->config_lock ); vlc_mutex_destroy( &priv->config_lock );
vlc_mutex_destroy( &priv->timer_lock ); vlc_mutex_destroy( &priv->timer_lock );
#ifndef NDEBUG /* Hack to dump leaked objects tree */
if( vlc_internals( p_libvlc )->i_refcount > 1 )
while( vlc_internals( p_libvlc )->i_refcount > 0 )
vlc_object_release( p_libvlc );
#endif
assert( vlc_internals( p_libvlc )->i_refcount == 1 ); assert( vlc_internals( p_libvlc )->i_refcount == 1 );
vlc_object_release( p_libvlc ); vlc_object_release( p_libvlc );
} }
......
...@@ -572,8 +572,6 @@ void __vlc_object_release( vlc_object_t *p_this ) ...@@ -572,8 +572,6 @@ void __vlc_object_release( vlc_object_t *p_this )
if( b_should_destroy ) if( b_should_destroy )
{ {
/* We have no children */
assert (internals->i_children == 0);
parent = p_this->p_parent; parent = p_this->p_parent;
#ifndef NDEBUG #ifndef NDEBUG
...@@ -607,6 +605,9 @@ void __vlc_object_release( vlc_object_t *p_this ) ...@@ -607,6 +605,9 @@ void __vlc_object_release( vlc_object_t *p_this )
if (parent) if (parent)
/* Detach from parent to protect against FIND_CHILDREN */ /* Detach from parent to protect against FIND_CHILDREN */
vlc_object_detach_unlocked (p_this); vlc_object_detach_unlocked (p_this);
/* We have no children */
assert (internals->i_children == 0);
} }
libvlc_unlock (p_this->p_libvlc); libvlc_unlock (p_this->p_libvlc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment