Warn about reparented object when debugging

diff --git a/src/libvlc.h b/src/libvlc.h
index 97e5dc182fad7539fb2a025fee5ab4d00316b72d..9949928a68c5eb261c82d747b33e93287f1dba81 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -183,6 +183,7 @@ struct vlc_object_internals
     vlc_object_internals_t *next;  /* next sibling */
     vlc_object_internals_t *prev;  /* previous sibling */
     vlc_object_internals_t *first; /* first child */
+    vlc_object_t   *old_parent;
 };
 
 #define ZOOM_SECTION N_("Zoom")

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 7d5570fa0f33b2959aa496222f71219692dbb988..fb1dc399b4104f3e5fbb0fbb23107e37fa20394f 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -154,6 +154,9 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
     p_priv->b_thread = false;
     p_new->p_parent = NULL;
     p_priv->first = NULL;
+#ifndef NDEBUG
+    p_priv->old_parent = NULL;
+#endif
 
     /* Initialize mutexes and condvars */
     vlc_mutex_init( &p_priv->var_lock );
@@ -612,6 +615,20 @@ void __vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
     priv->prev = NULL;
     vlc_object_hold (p_parent);
     libvlc_lock (p_this->p_libvlc);
+#ifndef NDEBUG
+    /* Reparenting an object carries a risk of invalid access to the parent,
+     * from another thread. This can happen when inheriting a variable, or
+     * through any direct access to vlc_object_t.p_parent. Also, reparenting
+     * brings a functional bug, whereby the reparented object uses incorrect
+     * old values for inherited variables (as the new parent may have different
+     * variable values, especially if it is an input).
+     * Note that the old parent may be already destroyed.
+     * So its pointer must not be dereferenced.
+     */
+    if (priv->old_parent)
+        msg_Info (p_this, "Reparenting an object is dangerous (%p -> %p)!",
+                  priv->old_parent, p_parent);
+#endif
 
     /* Attach the parent to its child */
     assert (!p_this->p_parent);
@@ -642,6 +659,9 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this)
         priv->next->prev = priv->prev;
 
     /* Remove p_this's parent */
+#ifndef NDEBUG
+    priv->old_parent = p_this->p_parent;
+#endif
     p_this->p_parent = NULL;
 }