Changeset f6d2c81 in mainline for uspace/libc/generic/thread.c

Timestamp:

2007-05-30T19:50:24Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c31e536

Parents:

51ec40f

Message:

Fix two memory leaks.

In kernel, kernel_uarg structure needs to be deallocated when a thread
with userspace context is destroyed.

In userspace, the return value of the SYS_THREAD_CREATE must be checked
for error conditions and in case of error, uarg and stack must be freed
up.

File:

• uspace/libc/generic/thread.c (modified) (3 diffs)

uspace/libc/generic/thread.c

@@ -78 +78 @@
          * Zero out the thread local uninitialized data.
          */
-        memset(data + (&_tbss_start - &_tdata_start), 0, &_tbss_end -
-                &_tbss_start);
+        memset(data + (&_tbss_start - &_tdata_start), 0,
+            &_tbss_end - &_tbss_start);
 
         return tcb;
@@ -129 +129 @@
  * @return Zero on success or a code from @ref errno.h on failure.
  */
-int thread_create(void (* function)(void *), void *arg, char *name, thread_id_t *tid)
+int thread_create(void (* function)(void *), void *arg, char *name,
+    thread_id_t *tid)
 {
         char *stack;
         uspace_arg_t *uarg;
+        int rc;
 
         stack = (char *) malloc(getpagesize() * THREAD_INITIAL_STACK_PAGES_NO);
@@ -150 +152 @@
         uarg->uspace_uarg = uarg;
         
-        return __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name, (sysarg_t) tid);
+        rc = __SYSCALL3(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
+            (sysarg_t) tid);
+        
+        if (!rc) {
+                /*
+                 * Failed to create a new thread.
+                 * Free up the allocated structures.
+                 */
+                free(uarg);
+                free(stack);
+        }
+
+        return rc;
 }