summaryrefslogtreecommitdiffstats
path: root/contrib/isc-dhcp/common/alloc.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1999-02-11 12:40:22 +0000
committerobrien <obrien@FreeBSD.org>1999-02-11 12:40:22 +0000
commita342fabba36426fd65daff3e995941df89606c88 (patch)
tree1ab69d6be8758743eebe6650b959ea559178112b /contrib/isc-dhcp/common/alloc.c
parent117fbe9a9bc304e0e099d61d60b1a5d016afff04 (diff)
downloadFreeBSD-src-a342fabba36426fd65daff3e995941df89606c88.zip
FreeBSD-src-a342fabba36426fd65daff3e995941df89606c88.tar.gz
Virgin import of ISC-DHCP v2.0b1pl11
Diffstat (limited to 'contrib/isc-dhcp/common/alloc.c')
-rw-r--r--contrib/isc-dhcp/common/alloc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/isc-dhcp/common/alloc.c b/contrib/isc-dhcp/common/alloc.c
index 172fcea..a958462 100644
--- a/contrib/isc-dhcp/common/alloc.c
+++ b/contrib/isc-dhcp/common/alloc.c
@@ -3,7 +3,7 @@
Memory allocation... */
/*
- * Copyright (c) 1995, 1996 The Internet Software Consortium.
+ * Copyright (c) 1995, 1996, 1998 The Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@
#ifndef lint
static char copyright[] =
-"$Id: alloc.c,v 1.13 1997/05/09 07:56:13 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
+"$Id: alloc.c,v 1.13.2.1 1998/11/24 22:17:15 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -57,7 +57,8 @@ VOIDPTR dmalloc (size, name)
VOIDPTR foo = (VOIDPTR)malloc (size);
if (!foo)
warn ("No memory for %s.", name);
- memset (foo, 0, size);
+ else
+ memset (foo, 0, size);
return foo;
}
OpenPOWER on IntegriCloud