Changeset 84876aa4 in mainline for kernel/generic/src/mm/malloc.c

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (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 master into gfx

Mainly to get XCW fixes

File:

• kernel/generic/src/mm/malloc.c (modified) (1 diff)

kernel/generic/src/mm/malloc.c

@@ -187 +187 @@
 void *malloc(size_t size)
 {
+        if (size + _offset < size)
+                return NULL;
+
         void *obj = mem_alloc(alignof(max_align_t), size + _offset) + _offset;