Fix pair of buffer size errors. Bug 1478

Reported-by: David Binderman

diff --git a/src/Makefile b/src/Makefile
index b913aec8a87938cee06ff7c9b69e23aa0965d214..99f4ab308eeffee7de11b610881f42dc6e1ccde5 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -94,6 +94,7 @@ cscope.files: FRC
                    -o -name "os.h*" -print \
                    -o -name "*akefile*" -print \
                    -o -name EDITME -print >> $@
+       ls OS/* >> $@
 
 FRC:
 

diff --git a/src/OS/os.c-Linux b/src/OS/os.c-Linux
index 1e8a6f47d1f2c49bfbe1a6aa56feba6b36e718d3..df0dff9db123344deffb0a50b2683b966f4e24b3 100644 (file)
--- a/src/OS/os.c-Linux
+++ b/src/OS/os.c-Linux
@@ -94,7 +94,7 @@ ip_address_item *last = NULL;
 ip_address_item  *next;
 char addr6p[8][5];
 unsigned int plen, scope, dad_status, if_idx;
-char devname[20];
+char devname[20+1];
 FILE *f;
 #endif
 

diff --git a/src/src/malware.c b/src/src/malware.c
index cae0cdd99f2e76ff3546bd5e056350d66e96ddaf..2d2a8c892136fad01fd16fa964453edfce600a9d 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -42,7 +42,7 @@ static struct scan
 #define MAX_CLAMD_ADDRESS_LENGTH_S "64"
 
 typedef struct clamd_address_container {
-  uschar tcp_addr[MAX_CLAMD_ADDRESS_LENGTH];
+  uschar tcp_addr[MAX_CLAMD_ADDRESS_LENGTH+1];
   unsigned int tcp_port;
 } clamd_address_container;