commit 6399317229fecd3f66b97e59a49e9ba0c8b3ffef from: Tracey Emery date: Mon Jun 15 22:21:22 2020 UTC enable debugging and fix modified chunk-pointer on free found on sparc64 commit - 53cf2704798591c8be79a58c9f68cb7b6484853a commit + 6399317229fecd3f66b97e59a49e9ba0c8b3ffef blob - 281d2a3209edc3bd15ed10b5126539ae458e5d1e blob + 54611db824a2fecc6fb211b1a206b7e0285a9c36 --- thingsd/Makefile +++ thingsd/Makefile @@ -21,6 +21,8 @@ CFLAGS+= -Wsign-compare -pthread CLEANFILES+= y.tab.h +DEBUG= -g -O2 + MAN= thingsd.8 thingsd.conf.5 .include blob - f60515eb55a1d4c5f6432bf8d1aaf389e2fae6f9 blob + cb23de46052b7ebd733ccc7b071997d130dd2631 --- thingsd/client.c +++ thingsd/client.c @@ -29,8 +29,8 @@ #include "thingsd.h" -extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t, - size_t, void *); +extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t, + size_t, void *); void clt_conn(int fd, short event, void *arg) blob - 44bfcf5c14a7c081feedf0ada831b7f0899f1c16 blob + c5fbef05f92091c5d41797cde55c5dceaa591db3 --- thingsd/sockets.c +++ thingsd/sockets.c @@ -266,13 +266,15 @@ open_clt_sock(char *ip_addr, int cport) char * get_ifaddrs(char *name) { - struct ifaddrs *ifap; - struct sockaddr *sa; + struct ifaddrs *ifap = 0, *ifa; + struct sockaddr *sa = NULL; char *addr = NULL; + char hbuf[NI_MAXHOST]; + int count = 0; if (getifaddrs(&ifap) == -1) fatalx("getifaddrs error"); - while (ifap) { + for (count = 0, ifa = ifap; ifa; ifa = ifa->ifa_next) { if ((ifap->ifa_addr) && ((ifap->ifa_addr->sa_family == AF_INET) || (ifap->ifa_addr->sa_family == AF_INET6))) { @@ -286,18 +288,20 @@ get_ifaddrs(char *name) (struct sockaddr_in6*) ifap->ifa_addr; sa = (struct sockaddr *) in6; } - if (getnameinfo(sa, sa->sa_len, addr, - sizeof(char) * NI_MAXHOST, NULL, 0, NI_NAMEREQD | + if (getnameinfo(sa, sa->sa_len, hbuf, + sizeof(hbuf), NULL, 0, NI_NAMEREQD | NI_NUMERICHOST)) log_warnx("getnameinfo error"); - if ((strcmp(name, ifap->ifa_name) == 0) && - *addr != '\0') { + addr = strdup(hbuf); + if (addr == NULL) + goto err; + if (strcmp(name, ifap->ifa_name) == 0) { freeifaddrs(ifap); return addr; } } - ifap = ifap->ifa_next; } +err: freeifaddrs(ifap); return NULL; }