Return the created object as NULL if constructor failed.

diff --git a/src/libcaptive/client/directory.c b/src/libcaptive/client/directory.c
index 7960091..f8c128b 100644 (file)
--- a/src/libcaptive/client/directory.c
+++ b/src/libcaptive/client/directory.c
@@ -172,8 +172,10 @@ CaptiveDirectoryObject *captive_directory_object;
        captive_leave();
        if (r==GNOME_VFS_OK)
                captive_usecount(+1);
-       else
+       else {
                g_object_unref(captive_directory_object);
+               *captive_directory_object_return=NULL;
+               }
        return r;
 }
 
@@ -205,8 +207,10 @@ CaptiveDirectoryObject *captive_directory_object;
        captive_leave();
        if (r==GNOME_VFS_OK)
                captive_usecount(+1);
-       else
+       else {
                g_object_unref(captive_directory_object);
+               *captive_directory_object_return=NULL;
+               }
        return r;
 }
 

diff --git a/src/libcaptive/client/file.c b/src/libcaptive/client/file.c
index 80df600..8ae9204 100644 (file)
--- a/src/libcaptive/client/file.c
+++ b/src/libcaptive/client/file.c
@@ -179,8 +179,10 @@ CaptiveFileObject *captive_file_object;
        captive_leave();
        if (r==GNOME_VFS_OK)
                captive_usecount(+1);
-       else
+       else {
                g_object_unref(captive_file_object);
+               *captive_file_object_return=NULL;
+               }
        return r;
 }
 
@@ -214,8 +216,10 @@ CaptiveFileObject *captive_file_object;
        captive_leave();
        if (r==GNOME_VFS_OK)
                captive_usecount(+1);
-       else
+       else {
                g_object_unref(captive_file_object);
+               *captive_file_object_return=NULL;
+               }
        return r;
 }