server: Check for STATUS_OBJECT_TYPE_MISMATCH before STATUS_ACCESS_DENIED in get_handle_obj.

bf3c2a06 · Bernhard Loos · Alexandre Julliard · 872c07a9 · bf3c2a06
Commit bf3c2a06 authored Jul 19, 2011 by Bernhard Loos Committed by Alexandre Julliard Jul 20, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

handle.c server/handle.c +7 -2

No files found.
--- a/server/handle.c
+++ b/server/handle.c
@@ -403,14 +403,19 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle,
            set_error( STATUS_INVALID_HANDLE );
            return NULL;
        }
+        obj = entry->ptr;
+        if (ops && (obj->ops != ops))
+        {
+            set_error( STATUS_OBJECT_TYPE_MISMATCH );  /* not the right type */
+            return NULL;
+        }
        if ((entry->access & access) != access)
        {
            set_error( STATUS_ACCESS_DENIED );
            return NULL;
        }
-        obj = entry->ptr;
    }
-    if (ops && (obj->ops != ops))
+    else if (ops && (obj->ops != ops))
    {
        set_error( STATUS_OBJECT_TYPE_MISMATCH );  /* not the right type */
        return NULL;