Changeset 436a0a5 in mainline for kernel/generic/src/lib/str.c

Timestamp:

2018-11-09T22:04:01Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

95d45482

Parents:

88e43bc (diff), abf6c01 (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) Reduce the number of blocking allocations in the kernel

File:

• kernel/generic/src/lib/str.c (modified) (2 diffs)

kernel/generic/src/lib/str.c

@@ -635 +635 @@
 {
         size_t size = str_size(src) + 1;
-        char *dest = nfmalloc(size);
-        assert(dest);
+        char *dest = malloc(size);
+        if (!dest)
+                return NULL;
 
         str_cpy(dest, size, src);
@@ -668 +669 @@
                 size = n;
 
-        char *dest = nfmalloc(size + 1);
-        assert(dest);
+        char *dest = malloc(size + 1);
+        if (!dest)
+                return NULL;
 
         str_ncpy(dest, size + 1, src, size);