Don't assume sa.sa_family is a short int.

[tinc] / src / subnet_parse.c

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 1d54c13..611d6bd 100644 (file)
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -186,6 +186,7 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 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;
@@ -255,7 +256,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
                for (int i = 0; i < 4; i++)
                        if (x[i] > 255)
                                return false;
-               sprintf(last_colon, ":%02x%02x:%02x%02x", 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, "::");
@@ -400,11 +401,8 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
                len -= result;
        }
 
-       if (subnet->weight != DEFAULT_WEIGHT) {
+       if (subnet->weight != DEFAULT_WEIGHT)
                snprintf(netstr, len, "#%d", subnet->weight);
-               netstr += result;
-               len -= result;
-       }
 
        return true;
 }