Changeset 70253688 in mainline for uspace/lib/c/generic/tls.c

Timestamp:

2012-09-07T08:12:05Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e0c836e8

Parents:

131d9a4 (diff), 8cf4823 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/lib/c/generic/tls.c (modified) (4 diffs)

uspace/lib/c/generic/tls.c

@@ -42 +42 @@
 #include <str.h>
 #include <align.h>
+#include <unistd.h>
 
 /** Create TLS (Thread Local Storage) data structures.
@@ -57 +58 @@
         
         tcb = __alloc_tls(&data, tls_size);
+        if (!tcb)
+                return NULL;
         
         /*
@@ -89 +92 @@
 
         result = malloc(sizeof(tcb_t) + size);
+        if (!result)
+                return NULL;
         *data = ((void *)result) + sizeof(tcb_t);
+
         return result;
 }
@@ -118 +124 @@
         size = ALIGN_UP(size, &_tls_alignment);
         *data = memalign((uintptr_t) &_tls_alignment, sizeof(tcb_t) + size);
-
+        if (!*data)
+                return NULL;
         tcb = (tcb_t *) (*data + size);
         tcb->self = tcb;