From: Thibault Godouet <yo8192@users.noreply.github.com>
Date: Sun, 5 Feb 2006 20:49:35 +0000 (+0000)
Subject: fixed a buffer overflow problem in make_msg()
X-Git-Tag: ver3_0_1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80134c7c8b9455d2ffc390cd7c539cc37f58c2e7;p=thirdparty%2Ffcron.git

fixed a buffer overflow problem in make_msg()
---

diff --git a/log.c b/log.c
index b75539e..ae67a7f 100644
--- a/log.c
+++ b/log.c
@@ -21,7 +21,7 @@
  *  `LICENSE' that comes with the fcron source distribution.
  */
 
- /* $Id: log.c,v 1.16 2006-01-11 00:48:09 thib Exp $ */
+ /* $Id: log.c,v 1.17 2006-02-05 20:49:35 thib Exp $ */
 
 /* This code is inspired by Anacron's sources of
    Itai Tzur <itzur@actcom.co.il> */
@@ -81,8 +81,9 @@ make_msg(const char *append, char *fmt, va_list args)
      * returns when the buffer overflows.  Hmmm... */
     len = vsnprintf(msg, MAX_MSG + 1, fmt, args);
     if ( append != NULL ) {
-	strncat(msg, ": ", MAX_MSG-len); 
-	strncat(msg, append, MAX_MSG-len);
+	size_t size_to_cat = ( (MAX_MSG-len) > 0) ? (MAX_MSG-len) : 0;
+	strncat(msg, ": ", size_to_cat); 
+	strncat(msg, append, size_to_cat);
 	len += 2 + strlen(append);
     }
     if (len >= MAX_MSG)