From 1ed98fdf61d9dd29369f246109081408082ce54d Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sun, 2 Sep 2007 15:19:07 +0000
Subject: use calloc() to avoid malloc(n * m) overflows; checked by djm canacar
 jsg

---
 usr.bin/grep/util.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'usr.bin/grep/util.c')

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
@@ -512,6 +512,16 @@ grep_malloc(size_t size)
 	return ptr;
 }
 
+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)
 {
-- 
cgit v1.2.3-59-g8ed1b