bump version to 2.4.4

* remove checks for negative unsigned ints, fixes #2 * harden error logging functions, fixes #3
tlby · Jan 31, 2019 · 29a9c23 · 29a9c23
1 parent ccb757d
commit 29a9c23
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+netmask (2.4.4) unstable; urgency=low
+
+  * harden error logging functions
+
+ -- Robert Stone <[email protected]>  Thu, 31 Jan 2019 09:26:52 -0800
+
 netmask (2.4.3) unstable; urgency=low
 
   * repair broken ":+" style range additions for #802884

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([netmask], [2.4.3])
+AC_INIT([netmask], [2.4.4])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])

diff --git a/errors.c b/errors.c
@@ -66,7 +66,7 @@ int status(const char *fmt, ...) {
 
     if(!show_status) return(0);
     va_start(args, fmt);
-    vsprintf(buf, fmt, args);
+    vsnprintf(buf, sizeof(buf), fmt, args);
     va_end(args);
     return(message(LOG_DEBUG, buf));
 }
@@ -76,7 +76,7 @@ int warn(const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
-    vsprintf(buf, fmt, args);
+    vsnprintf(buf, sizeof(buf), fmt, args);
     va_end(args);
     return(message(LOG_WARNING, buf));
 }
@@ -86,7 +86,7 @@ int panic(const char *fmt, ...) {
     va_list args;
 
     va_start(args, fmt);
-    vsprintf(buf, fmt, args);
+    vsnprintf(buf, sizeof(buf), fmt, args);
     va_end(args);
     message(LOG_ERR, buf);
     exit(1);
@@ -97,7 +97,7 @@ int message(int priority, const char *msg) {
 
     /* only handle errno if this is not an informational message */
     if(errno && priority < 5) {
-	sprintf(buf, "%s: %s", msg, strerror(errno));
+	snprintf(buf, sizeof(buf), "%s: %s", msg, strerror(errno));
 	errno = 0;
     } else strcpy(buf, msg);
     if(use_syslog) syslog(priority, "%s", buf);

diff --git a/netmask.c b/netmask.c
@@ -307,10 +307,10 @@ static inline int parse_mask(NM self, const char *str, int flags) {
     if(*p == '\0') {
         /* read it as a CIDR value */
         if(is_v4(self)) {
-            if(v < 0 || v > 32) return 0;
+            if(v > 32) return 0;
             v += 96;
         } else {
-            if(v < 0 || v > 128) return 0;
+            if(v > 128) return 0;
         }
         self->mask = u128_cidr(v);
     } else if(inet_pton(AF_INET6, str, &s6)) {