[ros-diffs] [tfaber] 54866: [LSASRV] - Correctly set return values in LsapGetObjectAttribute [CDMAKE] - Handle out-of-memory condition - Patch by Samuel Serapion

Author: tfaber
Date: Sat Jan  7 17:45:26 2012
New Revision: 54866

URL: http://svn.reactos.org/svn/reactos?rev=54866&view=rev
Log:
[LSASRV] - Correctly set return values in LsapGetObjectAttribute
[CDMAKE] - Handle out-of-memory condition
- Patch by Samuel Serapion

Modified:
    trunk/reactos/dll/win32/lsasrv/database.c
    trunk/reactos/tools/cdmake/cdmake.c

Modified: trunk/reactos/dll/win32/lsasrv/database.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.…
==============================================================================
--- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Jan  7 17:45:26 2012
@@ -510,13 +510,13 @@
     if (AttributeData == NULL || *AttributeSize == 0)
     {
         *AttributeSize = ValueSize;
-        Status == STATUS_SUCCESS;
+        Status = STATUS_SUCCESS;
         goto Done;
     }
     else if (*AttributeSize < ValueSize)
     {
         *AttributeSize = ValueSize;
-        Status == STATUS_BUFFER_OVERFLOW;
+        Status = STATUS_BUFFER_OVERFLOW;
         goto Done;
     }
 

Modified: trunk/reactos/tools/cdmake/cdmake.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=…
==============================================================================
--- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original)
+++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan  7 17:45:26 2012
@@ -633,6 +633,8 @@
     if (joliet_length > 64)
       error_exit ( "'%s' is not Joliet, aborting...", filename );
     d->joliet_name = malloc(joliet_length + 1);
+    if (d->joliet_name == NULL)
+      error_exit("Insufficient memory");
     strcpy(d->joliet_name, filename);
   }
 }