diff options
| author |   deraadt <deraadt@openbsd.org> | 2007-09-02 15:19:07 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2007-09-02 15:19:07 +0000 |
| commit | 1ed98fdf61d9dd29369f246109081408082ce54d (patch) | |
| tree | ad7631e58c83830d1fc51cbadb9a2da53c1abfb7 /usr.bin/grep/util.c | |
| parent | OpenCVS server init-support with OpenCVS and GNU cvs clients. (diff) | |
| download | wireguard-openbsd-1ed98fdf61d9dd29369f246109081408082ce54d.tar.xz wireguard-openbsd-1ed98fdf61d9dd29369f246109081408082ce54d.zip | |
use calloc() to avoid malloc(n * m) overflows; checked by djm canacar jsg
Diffstat (limited to 'usr.bin/grep/util.c')
| -rw-r--r-- | usr.bin/grep/util.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 0af93493a36..970dd1413e2 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.34 2006/12/26 20:59:23 otto Exp $ */ +/* $OpenBSD: util.c,v 1.35 2007/09/02 15:19:32 deraadt Exp $ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav @@ -513,6 +513,16 @@ grep_malloc(size_t size) } void * +grep_calloc(size_t nmemb, size_t size) +{ + void *ptr; + + if ((ptr = calloc(nmemb, size)) == NULL) + err(2, "calloc"); + return ptr; +} + +void * grep_realloc(void *ptr, size_t size) { if ((ptr = realloc(ptr, size)) == NULL) |