Merge pull request #10331 from MamziB/mamzi/oshmem-calloc

awlauria · web-flow · commit ba147558fbc2 · 2022-04-28T09:20:06.000-04:00
oshmem: making  shmem_calloc spec-compliant regarding zero-byte inputs
diff --git a/oshmem/shmem/c/shmem_alloc.c b/oshmem/shmem/c/shmem_alloc.c
@@ -39,6 +39,7 @@ void* shmem_malloc(size_t size)
 void* shmem_calloc(size_t count, size_t size)
 {
     size_t req_sz = count * size;
+    if (!req_sz) return NULL;
     void *ptr = _shmalloc(req_sz);
     if (ptr) {
         memset(ptr, 0, req_sz);

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ void* shmem_malloc(size_t size)`
`39`	`39`	`void* shmem_calloc(size_t count, size_t size)`
`40`	`40`	`{`
`41`	`41`	`size_t req_sz = count * size;`
	`42`	`+ if (!req_sz) return NULL;`
`42`	`43`	`void *ptr = _shmalloc(req_sz);`
`43`	`44`	`if (ptr) {`
`44`	`45`	`memset(ptr, 0, req_sz);`