summaryrefslogtreecommitdiff
path: root/bin/pax
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-09-02 15:19:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-09-02 15:19:41 +0000
commit6ebd04219f0d749c87a763e8afb578dfcd5223cc (patch)
treebb0f29e0a3791fff88551c93f5d4ba7113bdba43 /bin/pax
parentbe524287dc216d876f995eddcaf32762c702c6e9 (diff)
use calloc() to avoid malloc(n * m) overflows; checked by djm canacar jsg
Diffstat (limited to 'bin/pax')
-rw-r--r--bin/pax/tables.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/pax/tables.c b/bin/pax/tables.c
index 2705b319c33..e428051c3da 100644
--- a/bin/pax/tables.c
+++ b/bin/pax/tables.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tables.c,v 1.24 2006/11/17 08:38:04 otto Exp $ */
+/* $OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $ */
/* $NetBSD: tables.c,v 1.4 1995/03/21 09:07:45 cgd Exp $ */
/*-
@@ -38,7 +38,7 @@
#if 0
static const char sccsid[] = "@(#)tables.c 8.1 (Berkeley) 5/31/93";
#else
-static const char rcsid[] = "$OpenBSD: tables.c,v 1.24 2006/11/17 08:38:04 otto Exp $";
+static const char rcsid[] = "$OpenBSD: tables.c,v 1.25 2007/09/02 15:19:08 deraadt Exp $";
#endif
#endif /* not lint */
@@ -1102,7 +1102,7 @@ dir_start(void)
return(0);
dirsize = DIRP_SIZE;
- if ((dirp = malloc(dirsize * sizeof(DIRDATA))) == NULL) {
+ if ((dirp = calloc(dirsize, sizeof(DIRDATA))) == NULL) {
paxwarn(1, "Unable to allocate memory for directory times");
return(-1);
}