Changeset 4f3aa76 in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2018-11-09T22:03:24Z (7 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:

ba9a150

Parents:

b389f95

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 01:26:04)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Remove nfmalloc()

File:

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

kernel/generic/src/sysinfo/sysinfo.c

@@ -685 +685 @@
                 return ret;
 
-        char *path = (char *) nfmalloc(size + 1);
-        assert(path);
+        // TODO: Change this so that allocation is not needed.
+        char *path = malloc(size + 1);
+        if (!path)
+                return ret;
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&
@@ -794 +796 @@
                 return ret;
 
-        char *path = (char *) nfmalloc(size + 1);
-        assert(path);
+        // TODO: Change this so that allocation is not needed.
+        char *path = malloc(size + 1);
+        if (!path)
+                return ret;
 
         if ((copy_from_uspace(path, ptr, size + 1) == 0) &&