From 95ed77e573e303c4121e803da21e806a04c667fd Mon Sep 17 00:00:00 2001
From: Tomasz Kojm <tkojm@clamav.net>
Date: Tue, 21 Sep 2010 16:33:19 +0200
Subject: [PATCH] sigtool/sigtool.c: don't use of sizeof() for malloc'ed buffer
 (bb#2283)

---
 ChangeLog         |  4 ++++
 sigtool/sigtool.c | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d41cbc0c1..148d05c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 21 16:32:22 CEST 2010 (tk)
+----------------------------------
+ * sigtool/sigtool.c: don't use of sizeof() for malloc'ed buffer (bb#2283)
+
 Tue Sep 21 16:19:41 CEST 2010 (tk)
 ----------------------------------
  * clamdscan/proto.c: fix error path memleak (bb#2282)
diff --git a/sigtool/sigtool.c b/sigtool/sigtool.c
index 50e8d0dca..643db96e5 100644
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@@ -1662,10 +1662,10 @@ static int compare(const char *oldpath, const char *newpath, FILE *diff)
 		    fseek(old, opos, SEEK_SET);
 
 		    if(found) {
-			strncpy(tbuff, obuff, sizeof(tbuff));
-			tbuff[sizeof(tbuff)-1]='\0';
+			strncpy(tbuff, obuff, l1);
+			tbuff[l1-1]='\0';
 			for(i = 0; i < tline; i++) {
-			    tbuff[16] = 0;
+			    tbuff[MIN(16, l1-1)] = 0;
 			    if((pt = strchr(tbuff, ' ')))
 				*pt = 0;
 			    fprintf(diff, "DEL %u %s\n", oline + i, tbuff);
@@ -1675,7 +1675,7 @@ static int compare(const char *oldpath, const char *newpath, FILE *diff)
 			oline += tline;
 
 		    } else {
-			obuff[16] = 0;
+			obuff[MIN(16, l1-1)] = 0;
 			if((pt = strchr(obuff, ' ')))
 			    *pt = 0;
 			fprintf(diff, "XCHG %u %s %s\n", oline, obuff, nbuff);
@@ -1693,7 +1693,7 @@ static int compare(const char *oldpath, const char *newpath, FILE *diff)
     if(old) {
 	while(fgets(obuff, l1, old)) {
 	    oline++;
-	    obuff[16] = 0;
+	    obuff[MIN(16, l1-1)] = 0;
 	    if((pt = strchr(obuff, ' ')))
 		*pt = 0;
 	    fprintf(diff, "DEL %u %s\n", oline, obuff);