X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/269833af78c68552b07703c053fd1c271670c31e..65c2a918d47e70f9dcb41e32e45370c5c6a37db0:/lib/compat.c diff --git a/lib/compat.c b/lib/compat.c index 1c185d9f..e84da83c 100644 --- a/lib/compat.c +++ b/lib/compat.c @@ -103,6 +103,7 @@ { size_t len = strlen(s); size_t ret = len; + if (bufsize <= 0) return 0; if (len >= bufsize) len = bufsize-1; memcpy(d, s, len); d[len] = 0; @@ -137,10 +138,10 @@ unsigned char *p = (unsigned char *)&ip.s_addr; static char buf[18]; #if WORDS_BIGENDIAN - slprintf(buf, 18, "%d.%d.%d.%d", + snprintf(buf, 18, "%d.%d.%d.%d", (int)p[0], (int)p[1], (int)p[2], (int)p[3]); #else - slprintf(buf, 18, "%d.%d.%d.%d", + snprintf(buf, 18, "%d.%d.%d.%d", (int)p[3], (int)p[2], (int)p[1], (int)p[0]); #endif return buf; @@ -155,12 +156,12 @@ if (strcmp(cp, "255.255.255.255") == 0) { inp->s_addr = (unsigned) -1; - return 1; + return 0; } if (sscanf(cp, "%u.%u.%u.%u", &a1, &a2, &a3, &a4) != 4 || a1 > 255 || a2 > 255 || a3 > 255 || a4 > 255) { - return 1; + return 0; } ret = (a1 << 24) | (a2 << 16) | (a3 << 8) | a4;