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

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

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;