Fixed Vfs-parent handling of sandbox-slave crash during its shutdown.

 - Bugreport by the courtesy of Pavel "Pavouk" Ruzicka.

diff --git a/src/libcaptive/sandbox/parent-Vfs.c b/src/libcaptive/sandbox/parent-Vfs.c
index 0a8c290..cac0aaf 100644 (file)
--- a/src/libcaptive/sandbox/parent-Vfs.c
+++ b/src/libcaptive/sandbox/parent-Vfs.c
@@ -124,6 +124,10 @@ GIOStatus erriostatus;
        Captive_Vfs_shutdown(captive_vfs_parent_object->corba_Vfs_object,&captive_corba_ev);
        r=captive_sandbox_parent_return_from_CORBA_Environment(&captive_corba_ev,captive_vfs_parent_object);
 
+       /* We may get called by recursion from captive_sandbox_parent_return_from_CORBA_Environment(): */
+       if (captive_vfs_parent_object->corba_Vfs_object==CORBA_OBJECT_NIL)
+               return r;
+
        /* Always clear 'corba_Vfs_object' even if 'r' means failure. */
        CORBA_Object_release(captive_vfs_parent_object->corba_Vfs_object,&captive_corba_ev);
        g_assert(validate_CORBA_Environment(&captive_corba_ev));