diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpcap/optimize.c | 14 | ||||
| -rw-r--r-- | lib/libpcap/pcap.c | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lib/libpcap/optimize.c b/lib/libpcap/optimize.c index add2fd9da84..16b19f1b67b 100644 --- a/lib/libpcap/optimize.c +++ b/lib/libpcap/optimize.c @@ -1,4 +1,4 @@ -/* $OpenBSD: optimize.c,v 1.14 2014/03/16 08:33:05 deraadt Exp $ */ +/* $OpenBSD: optimize.c,v 1.15 2014/06/26 04:03:33 lteo Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 @@ -1810,23 +1810,23 @@ opt_init(root) */ unMarkAll(); n = count_blocks(root); - blocks = (struct block **)calloc(n, sizeof(*blocks)); + blocks = reallocarray(NULL, n, sizeof(*blocks)); if (blocks == NULL) bpf_error("malloc"); - + unMarkAll(); n_blocks = 0; number_blks_r(root); n_edges = 2 * n_blocks; - edges = (struct edge **)calloc(n_edges, sizeof(*edges)); + edges = reallocarray(NULL, n_edges, sizeof(*edges)); if (edges == NULL) bpf_error("malloc"); /* * The number of levels is bounded by the number of nodes. */ - levels = (struct block **)calloc(n_blocks, sizeof(*levels)); + levels = reallocarray(NULL, n_blocks, sizeof(*levels)); if (levels == NULL) bpf_error("malloc"); @@ -1901,8 +1901,8 @@ fail2: * we'll need. */ maxval = 3 * max_stmts; - vmap = (struct vmapinfo *)calloc(maxval, sizeof(*vmap)); - vnode_base = (struct valnode *)calloc(maxval, sizeof(*vmap)); + vmap = reallocarray(NULL, maxval, sizeof(*vmap)); + vnode_base = reallocarray(NULL, maxval, sizeof(*vmap)); if (vmap == NULL || vnode_base == NULL) bpf_error("malloc"); } diff --git a/lib/libpcap/pcap.c b/lib/libpcap/pcap.c index 9403efa340b..6757e769ab0 100644 --- a/lib/libpcap/pcap.c +++ b/lib/libpcap/pcap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcap.c,v 1.14 2014/03/14 03:44:13 lteo Exp $ */ +/* $OpenBSD: pcap.c,v 1.15 2014/06/26 04:03:33 lteo Exp $ */ /* * Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998 @@ -265,7 +265,8 @@ pcap_list_datalinks(pcap_t *p, int **dlt_buffer) **dlt_buffer = p->linktype; return (1); } else { - *dlt_buffer = (int*)calloc(sizeof(**dlt_buffer), p->dlt_count); + *dlt_buffer = reallocarray(NULL, sizeof(**dlt_buffer), + p->dlt_count); if (*dlt_buffer == NULL) { (void)snprintf(p->errbuf, sizeof(p->errbuf), "malloc: %s", pcap_strerror(errno)); |