mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-18 02:19:39 +00:00
grep: don't rely on implementation-defined malloc(0) behavior
The very few places that rely on malloc/calloc of a zero-size region
won't attempt to dereference it, so just return NULL rather than rolling
the dice with the underlying malloc implementation.
Reported by: brooks, Shawn Webb
(cherry picked from commit e116e040f3
)
This commit is contained in:
parent
2c7e964254
commit
9c170b3d52
@ -650,6 +650,8 @@ grep_malloc(size_t size)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if (size == 0)
|
||||
return (NULL);
|
||||
if ((ptr = malloc(size)) == NULL)
|
||||
err(2, "malloc");
|
||||
return (ptr);
|
||||
@ -663,6 +665,8 @@ grep_calloc(size_t nmemb, size_t size)
|
||||
{
|
||||
void *ptr;
|
||||
|
||||
if (nmemb == 0 || size == 0)
|
||||
return (NULL);
|
||||
if ((ptr = calloc(nmemb, size)) == NULL)
|
||||
err(2, "calloc");
|
||||
return (ptr);
|
||||
|
Loading…
Reference in New Issue
Block a user