From: Tobias Oetiker <tobi@oetiker.ch>
Date: Tue, 27 Sep 2011 06:15:36 +0000 (+0000)
Subject: fix buffer overflow for LONG lines in journal handling code for update requests.
X-Git-Tag: v1.5.0-rc1~285
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4da9809fe37f0c7c9b43fe1e6dbd6f4a9d74b16;p=thirdparty%2Frrdtool-1.x.git

fix buffer overflow for LONG lines in journal handling code for update requests.
fix for #316


git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2202 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/src/rrd_daemon.c b/src/rrd_daemon.c
index 9ecd39fb..27371441 100644
--- a/src/rrd_daemon.c
+++ b/src/rrd_daemon.c
@@ -1331,7 +1331,7 @@ static int handle_request_update (HANDLER_PROTO) /* {{{ */
 
   /* save it for the journal later */
   if (!JOURNAL_REPLAY(sock))
-    strncpy(orig_buf, buffer, buffer_size);
+    strncpy(orig_buf, buffer, min(RRD_CMD_MAX,buffer_size));
 
   status = buffer_get_field (&buffer, &buffer_size, &file);
   if (status != 0)