diff options
Diffstat (limited to 'src/platform/posix')
| -rw-r--r-- | src/platform/posix/posix_alloc.c | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_file.c | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/platform/posix/posix_alloc.c b/src/platform/posix/posix_alloc.c index f4b0245c..f0847408 100644 --- a/src/platform/posix/posix_alloc.c +++ b/src/platform/posix/posix_alloc.c @@ -17,13 +17,13 @@ void * nni_alloc(size_t sz) { - return (malloc(sz)); + return (sz > 0 ? malloc(sz) : NULL); } void * nni_zalloc(size_t sz) { - return (calloc(1, sz)); + return (sz > 0 ? calloc(1, sz) : NULL); } void diff --git a/src/platform/posix/posix_file.c b/src/platform/posix/posix_file.c index b21c0509..5d918d6b 100644 --- a/src/platform/posix/posix_file.c +++ b/src/platform/posix/posix_file.c @@ -115,14 +115,18 @@ nni_plat_file_get(const char *name, void **datap, size_t *lenp) } len = st.st_size; - if ((data = nni_alloc(len)) == NULL) { - rv = NNG_ENOMEM; - goto done; - } - if (fread(data, 1, len, f) != len) { - rv = nni_plat_errno(errno); - nni_free(data, len); - goto done; + if (len > 0) { + if ((data = nni_alloc(len)) == NULL) { + rv = NNG_ENOMEM; + goto done; + } + if (fread(data, 1, len, f) != len) { + rv = nni_plat_errno(errno); + nni_free(data, len); + goto done; + } + } else { + data = NULL; } *datap = data; *lenp = len; |
