diff --git a/reactos/dll/win32/lsasrv/database.c b/reactos/dll/win32/lsasrv/database.c
index 781b90f6c55..ef410625d37 100644
--- a/reactos/dll/win32/lsasrv/database.c
+++ b/reactos/dll/win32/lsasrv/database.c
@@ -510,13 +510,13 @@ LsapGetObjectAttribute(PLSA_DB_OBJECT DbObject,
     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;
     }
 
diff --git a/reactos/tools/cdmake/cdmake.c b/reactos/tools/cdmake/cdmake.c
index 4f6ff6488b0..2ce935d79d5 100644
--- a/reactos/tools/cdmake/cdmake.c
+++ b/reactos/tools/cdmake/cdmake.c
@@ -633,6 +633,8 @@ void parse_filename_into_dirrecord ( const char* filename, PDIR_RECORD d, BOOL d
     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);
   }
 }