Changeset bb84da65bde754021ec602e99e3861b7e8ebafa3

Timestamp:

05/14/08 20:58:16 (4 months ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1210791496 +0300

git-parent:

[52d943331f7d21d9de67d025ff06d33d0ae5eee8]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1210791496 +0300

Message:

Debug code to prevent FIND_PARENT from crashing.

This will postpone a due abort or turn a crash into an abort.
Objects must not have children when they are destroyed per the current
design, though this seems to be a questionable choice.

Files:

• src/misc/objects.c (modified) (3 diffs)

src/misc/objects.c

@@ -867 +867 @@
-    if( b_should_destroy )
-    {
- so that it cannot be returned from
-vlc_object_find() and friends.
+
+so that it cannot be encountered by vlc_object_get()
-        libvlc_global_data_t *p_libvlc_global = vlc_global();
-        int i_index;
@@ -876 +876 @@
-        REMOVE_ELEM( p_libvlc_global->pp_objects,
-                     p_libvlc_global->i_objects, i_index );
+
+        /* Detach from parent to protect against FIND_CHILDREN */
-        if (p_this->p_parent)
-            vlc_object_detach_unlocked (p_this);
+#ifndef NDEBUG
+        /* Detach from children to protect against FIND_PARENT.
+         * Destroying an object with children is currently not allowed anyway.
+         * This code is there only to ensure that the debugging code in
+         * vlc_object_destroy() will be invoked before a concurrent
+         * FIND_PARENT gets the chance to crash the process. */
+        for (int i = 0; i < p_this->i_children; i++)
+            p_this->pp_children[i]->p_parent = NULL;
+#endif
-    }
-
@@ -900 +911 @@
-
-    /* Attach the parent to its child */
+    assert (!p_this->p_parent);
-    p_this->p_parent = p_parent;
-