diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2017-02-22 19:04:07 +0100 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2017-02-22 21:53:36 +0000 |
| commit | 785a0d8e75560a9a8733f667751ea403f6400d53 (patch) | |
| tree | 2361150fcc672f4979ce12e0add108558c15a476 /caputils | |
| parent | 936a4c1eb95384bca8563d2b210d243167f4fe20 (diff) | |
| download | wireshark-785a0d8e75560a9a8733f667751ea403f6400d53.tar.gz | |
g_malloc -> g_malloc0 where not all struct elements are initialized or
when combined with memset.
Change-Id: I5148a65bee6d4d00c140113ffb1e228adefae93f
Reviewed-on: https://code.wireshark.org/review/20251
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'caputils')
| -rw-r--r-- | caputils/airpcap_loader.c | 2 | ||||
| -rw-r--r-- | caputils/capture-pcap-util-unix.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/caputils/airpcap_loader.c b/caputils/airpcap_loader.c index 8a9d10a5dc..1d290b4edd 100644 --- a/caputils/airpcap_loader.c +++ b/caputils/airpcap_loader.c @@ -607,7 +607,7 @@ airpcap_driver_fake_if_info_new(void) ad = airpcap_if_open(if_info->name, ebuf); if (ad) { - fake_if_info = (airpcap_if_info_t *)g_malloc(sizeof (airpcap_if_info_t)); + fake_if_info = (airpcap_if_info_t *)g_malloc0(sizeof (airpcap_if_info_t)); fake_if_info->name = g_strdup(if_info->name); fake_if_info->description = g_strdup(if_info->description); fake_if_info->loopback = FALSE; diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c index a11eefa29c..7dd49a1b30 100644 --- a/caputils/capture-pcap-util-unix.c +++ b/caputils/capture-pcap-util-unix.c @@ -159,10 +159,9 @@ get_interface_list(int *err, char **err_str) lastlen = 0; len = 100 * sizeof(struct ifreq); for ( ; ; ) { - buf = (char *)g_malloc(len); + buf = (char *)g_malloc0(len); ifc.ifc_len = len; ifc.ifc_buf = buf; - memset (buf, 0, len); if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) { if (errno != EINVAL || lastlen != 0) { if (err_str != NULL) { |