aboutsummaryrefslogtreecommitdiff
path: root/src/platform/posix/posix_alloc.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-08-06 21:26:31 +0300
committerGarrett D'Amore <garrett@damore.org>2018-08-06 22:51:37 +0300
commit8bea70c68e3f7ac23d4ff10b758af718ffb94263 (patch)
treefa0acc0c76dce541911cd9095c5c78aec31e9f71 /src/platform/posix/posix_alloc.c
parentb717dfefa5b1e8fa20ded02f3a79e2c8d2f24f41 (diff)
downloadnng-8bea70c68e3f7ac23d4ff10b758af718ffb94263.tar.gz
nng-8bea70c68e3f7ac23d4ff10b758af718ffb94263.tar.bz2
nng-8bea70c68e3f7ac23d4ff10b758af718ffb94263.zip
fixes #611 Memory Leaks under Windows
fixes #622 incorrect assumptions about malloc(0) Windows actually allocates an object of size zero when calling malloc on size zero. This is unusual behavior, and we just add logic to work more like malloc on POSIX systems. Other systems can return non-NULL objects to fixed pages here. We think the best option here is to uniformly return NULL from our APIs in these circumstances, and to include testing to validate that.
Diffstat (limited to 'src/platform/posix/posix_alloc.c')
-rw-r--r--src/platform/posix/posix_alloc.c4
1 files changed, 2 insertions, 2 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