[ros-diffs] [ion] 24570: - Fix SD charges to 2048 bytes instead of 2000. - Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed.

[ion at svn.reactos.org]

Author: ion
Date: Thu Oct 19 07:09:19 2006
New Revision: 24570

URL: http://svn.reactos.org/svn/reactos?rev=24570&view=rev
Log:
- Fix SD charges to 2048 bytes instead of 2000.
- Fix a memory leak in ObOpenObjectByName. Object Create Information is now freed.

Modified:
    trunk/reactos/ntoskrnl/ob/obhandle.c
    trunk/reactos/ntoskrnl/ob/oblife.c

Modified: trunk/reactos/ntoskrnl/ob/obhandle.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=24570&r1=24569&r2=24570&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ob/obhandle.c (original)
+++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Oct 19 07:09:19 2006
@@ -1559,8 +1559,9 @@
         if (ObjectHeader->ObjectCreateInfo)
         {
             /* Free it */
-            //ObpFreeAndReleaseCapturedAttributes(&ObjectCreateInfo);
-            //ObjectHeader->ObjectCreateInfo = NULL;
+            ObpFreeAndReleaseCapturedAttributes(ObjectHeader->
+                                                ObjectCreateInfo);
+            ObjectHeader->ObjectCreateInfo = NULL;
         }
     }
     else

Modified: trunk/reactos/ntoskrnl/ob/oblife.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=24570&r1=24569&r2=24570&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ob/oblife.c (original)
+++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Oct 19 07:09:19 2006
@@ -105,7 +105,7 @@
                                      TypeInfo.DefaultNonPagedPoolCharge;
 
                 /* Add the SD charge too */
-                if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2000;
+                if (Header->Flags & OB_FLAG_SECURITY) PagedPoolCharge += 2048;
             }
 
             /* FIXME: Should be returning quota */
@@ -546,7 +546,7 @@
              ObjectType->TypeInfo.DefaultPagedPoolCharge) ||
             (ObjectCreateInfo->NonPagedPoolCharge !=
              ObjectType->TypeInfo.DefaultNonPagedPoolCharge) ||
-            (ObjectCreateInfo->SecurityDescriptorCharge > 2000) ||
+            (ObjectCreateInfo->SecurityDescriptorCharge > 2048) ||
             (ObjectCreateInfo->Attributes & OBJ_EXCLUSIVE))
         {
             /* Set quota size */