Skip to content
Snippets Groups Projects
Commit 40a0b8e3 authored by Jakob Olsson's avatar Jakob Olsson
Browse files

fix memory leaks by replacing lexer with strtok

parent aa4bdd9f
No related branches found
No related tags found
No related merge requests found
...@@ -498,12 +498,12 @@ int get_devices(void) ...@@ -498,12 +498,12 @@ int get_devices(void)
name = get_device_name(path); name = get_device_name(path);
if (!name) if (!name)
continue; continue;
dev = (struct device *)calloc(1, sizeof(*dev)); dev = (struct device *)calloc(1, sizeof(*dev));
if (!dev) { if (!dev) {
perror("calloc"); perror("calloc");
goto fail_dev; goto fail_dev;
} }
dev->usb.product = get_usb_stat(path, "product"); dev->usb.product = get_usb_stat(path, "product");
dev->usb.product_id = get_usb_stat(path, "idProduct"); dev->usb.product_id = get_usb_stat(path, "idProduct");
dev->usb.vendor_id = get_usb_stat(path, "idVendor"); dev->usb.vendor_id = get_usb_stat(path, "idVendor");
...@@ -543,34 +543,25 @@ char *get_device_ip(char *device_name) ...@@ -543,34 +543,25 @@ char *get_device_ip(char *device_name)
while ((fgets(route, 1024, fp)) != NULL) { while ((fgets(route, 1024, fp)) != NULL) {
remove_newline(route); remove_newline(route);
iface = lexer(&route, "\t"); iface = strtok(route, "\t");
destination = lexer(&route, "\t"); destination = strtok(NULL, "\t");
gateway = lexer(&route, "\t"); gateway = strtok(NULL, "\t");
flags = lexer(&route, "\t"); flags = strtok(NULL, "\t");
if (strncmp(iface, device_name, 10) != 0) if (strncmp(iface, device_name, 10) != 0)
goto free_vars; continue;
printf("iface %s");
host_flag = atoi(flags) & 4; host_flag = atoi(flags) & 4;
if (!host_flag) if (!host_flag)
goto free_vars; continue;
ipv4_addr = (char *)calloc(1, IPV4_MAX); ipv4_addr = (char *)calloc(1, IPV4_MAX);
if (!ipv4_addr) { if (!ipv4_addr)
free(iface);
free(destination);
free(gateway);
free(flags);
break; break;
}
addr.s_addr = strtoul(destination, NULL, IPV4_MAX); addr.s_addr = strtoul(destination, NULL, IPV4_MAX);
inet_ntop(AF_INET, &(addr.s_addr), ipv4_addr, IPV4_MAX); inet_ntop(AF_INET, &(addr.s_addr), ipv4_addr, IPV4_MAX);
free_vars:
free(iface);
free(destination);
free(gateway);
free(flags);
} }
free(route); free(route);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment