bool str2net(subnet_t *subnet, const char *subnetstr) {
char str[1024];
strncpy(str, subnetstr, sizeof(str));
+ str[sizeof str - 1] = 0;
int consumed;
int weight = DEFAULT_WEIGHT;
for (int i = 0; i < 4; i++)
if (x[i] > 255)
return false;
- sprintf(last_colon, ":%02hx%02hx:%02hx%02hx", x[0], x[1], x[2], x[3]);
+ snprintf(last_colon, sizeof str - (last_colon - str), ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
}
char* double_colon = strstr(str, "::");
if (double_colon) {
/* Figure out how many zero groups we need to expand */
int zero_group_count = 8;
- for (const char* cur = str; *cur; *cur && cur++)
+ for (const char* cur = str; *cur; cur++)
if (*cur != ':') {
zero_group_count--;
- for (; *cur && *cur != ':'; cur++);
+ while(cur[1] && cur[1] != ':')
+ cur++;
}
if (zero_group_count < 1)
return false;
int prefixlength = -1;
switch (subnet->type) {
case SUBNET_MAC:
- result = snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx",
+ result = snprintf(netstr, len, "%02x:%02x:%02x:%02x:%02x:%02x",
subnet->net.mac.address.x[0],
subnet->net.mac.address.x[1],
subnet->net.mac.address.x[2],
subnet->net.mac.address.x[3],
subnet->net.mac.address.x[4],
- subnet->net.mac.address.x[5],
- subnet->weight);
+ subnet->net.mac.address.x[5]);
netstr += result;
len -= result;
break;
case SUBNET_IPV4:
- result = snprintf(netstr, len, "%hu.%hu.%hu.%hu",
+ result = snprintf(netstr, len, "%u.%u.%u.%u",
subnet->net.ipv4.address.x[0],
subnet->net.ipv4.address.x[1],
subnet->net.ipv4.address.x[2],