Fixed the EnvP array passed to Proc_StartUser not being NULL terminated

[tpg/acess2.git] / Kernel / messages.c

diff --git a/Kernel/messages.c b/Kernel/messages.c
index 31ae8f3..32e579b 100644 (file)
--- a/Kernel/messages.c
+++ b/Kernel/messages.c
@@ -2,8 +2,8 @@
  * AcessOS Microkernel Version
  * messages.c
  */
-#include <common.h>
-#include <proc.h>
+#include <acess.h>
+#include <threads.h>
 #include <errno.h>
 
 // === CODE ===
@@ -12,6 +12,8 @@
  * \brief Send an IPC message
  * \param Err  Pointer to the errno variable
  * \param Dest Destination Thread
+ * \param Length       Length of the message
+ * \param Data Message data
  */
 int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 {
@@ -26,7 +28,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
        }
        
        // Get thread
-       thread = Proc_GetThread( Dest );
+       thread = Threads_GetThread( Dest );
        
        // Error check
        if(!thread) {   return -1;      }
@@ -40,7 +42,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
        // Create message
        msg = malloc( sizeof(tMsg)+Length );
        msg->Next = NULL;
-       msg->Source = gCurrentThread->TID;
+       msg->Source = Proc_GetCurThread()->TID;
        msg->Length = Length;
        memcpy(msg->Data, Data, Length);
        
@@ -55,7 +57,7 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
        
        RELEASE(&thread->IsLocked);
        
-       Thread_Wake( thread );
+       Threads_Wake( thread );
        
        return 0;
 }
@@ -63,40 +65,52 @@ int Proc_SendMessage(Uint *Err, Uint Dest, int Length, void *Data)
 /**
  * \fn int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
  * \brief Gets a message
+ * \param Err  Pointer to \a errno
+ * \param Source       Where to put the source TID
+ * \param Buffer       Buffer to place the message data (set to NULL to just get message length)
  */
 int Proc_GetMessage(Uint *Err, Uint *Source, void *Buffer)
 {
         int    ret;
        void *tmp;
+       tThread *cur = Proc_GetCurThread();
        
        // Check if queue has any items
-       if(!gCurrentThread->Messages) {
+       if(!cur->Messages) {
                return 0;
        }
 
-       LOCK( &gCurrentThread->IsLocked );
+       LOCK( &cur->IsLocked );
        
        if(Source)
-               *Source = gCurrentThread->Messages->Source;
+               *Source = cur->Messages->Source;
        
        // Get message length
        if( !Buffer ) {
-               ret = gCurrentThread->Messages->Length;
-               RELEASE( &gCurrentThread->IsLocked );
+               ret = cur->Messages->Length;
+               RELEASE( &cur->IsLocked );
                return ret;
        }
        
        // Get message
        if(Buffer != GETMSG_IGNORE)
-               memcpy(Buffer, gCurrentThread->Messages->Data, gCurrentThread->Messages->Length);
-       ret = gCurrentThread->Messages->Length;
+       {
+               if( !CheckMem( Buffer, cur->Messages->Length ) )
+               {
+                       *Err = -EINVAL;
+                       RELEASE( &cur->IsLocked );
+                       return -1;
+               }
+               memcpy(Buffer, cur->Messages->Data, cur->Messages->Length);
+       }
+       ret = cur->Messages->Length;
        
        // Remove from list
-       tmp = gCurrentThread->Messages->Next;
-       free(gCurrentThread->Messages);
-       gCurrentThread->Messages = tmp;
+       tmp = cur->Messages->Next;
+       free( (void*)cur->Messages );
+       cur->Messages = tmp;
        
-       RELEASE( &gCurrentThread->IsLocked );
+       RELEASE( &cur->IsLocked );
        
        return ret;
 }