Fix refcount leak and return correct error in create_named_object.

9a7b41ad · Vitaliy Margolen · Alexandre Julliard · 8e74308a · 9a7b41ad
Commit 9a7b41ad authored Sep 28, 2005 by Vitaliy Margolen Committed by Alexandre Julliard Sep 28, 2005
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

object.c server/object.c +4 -4

No files found.
--- a/server/object.c
+++ b/server/object.c
@@ -166,14 +166,14 @@ void *create_named_object( struct namespace *namespace, const struct object_ops 

    if ((obj = find_object( namespace, name, len )))
    {
-        if (obj->ops == ops)
+        if (obj->ops != ops)
        {
+            release_object( obj );
+            obj = NULL;
+        }
        set_error( STATUS_OBJECT_NAME_COLLISION );
        return obj;
    }
-        set_error( STATUS_OBJECT_TYPE_MISMATCH );
-        return NULL;
-    }
    if (!(name_ptr = alloc_name( name, len ))) return NULL;
    if ((obj = alloc_object( ops )))
    {