ports/167771: [patch] net-mgmt/mrtg fix rateup's coredump

[Alexey V. Panfilov]

The following reply was made to PR ports/167771; it has been noted by GNATS.

From: "Alexey V. Panfilov" <ports at subnets.ru>
To: FreeBSD-gnats-submit at FreeBSD.org, freebsd-ports-bugs at FreeBSD.org
Cc:  
Subject: Re: ports/167771: [patch] net-mgmt/mrtg fix rateup's coredump
Date: Thu, 10 May 2012 14:57:22 +0400

 This is a multi-part message in MIME format.
 --------------090800080601000900090905
 Content-Type: text/plain; charset=KOI8-R; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Forgot add PORTREVISION to Makefile
 
 --
 Simple Lehisnoe ;-)
 
 --------------090800080601000900090905
 Content-Type: text/plain; charset=KOI8-R;
  name="mrtg_diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="mrtg_diff.txt"
 
 diff -ruN mrtg.old/Makefile mrtg/Makefile
 --- mrtg/Makefile	2012-05-10 14:51:08.000000000 +0400
 +++ mrtg/Makefile	2012-05-10 14:48:26.000000000 +0400
 @@ -7,6 +7,7 @@
  
  PORTNAME=	mrtg
  PORTVERSION=	2.17.4
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	net-mgmt ipv6
  MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
 diff -ruN mrtg.old/files/patch-aaa.txt mrtg/files/patch-aaa.txt
 --- mrtg/files/patch-aaa.txt	1970-01-01 03:00:00.000000000 +0300
 +++ mrtg/files/patch-aaa.txt	2012-05-10 14:34:05.000000000 +0400
 @@ -0,0 +1,36 @@
 +--- src/rateup.c.orig	2012-05-10 05:40:49.259760823 -0300
 ++++ src/rateup.c	2012-05-10 05:44:32.297657818 -0300
 +@@ -1132,9 +1132,10 @@
 +   gdImageDestroy (brush_outp);
 +   free (lhist);
 +   free (graph_label);
 +-  if (kMG)
 ++  if (kMG) {
 +     free(short_si);
 +-
 ++    short_si = short_si_def;
 ++  }
 +
 + #ifdef WIN32
 +   /* got to remove the target under win32
 +@@ -1563,8 +1564,10 @@
 + 	}
 +       else
 + 	{
 +-	  strcpy (last.in, in);
 +-	  strcpy (last.out, out);
 ++	  strncpy (last.in, in, MAXL);
 ++	  last.in[MAXL-1]='\0';
 ++	  strncpy (last.out, out,MAXL);
 ++	  last.out[MAXL-1]='\0';
 + 	}
 +       fprintf (fo, "%lu " LLD " " LLD " " LLD " " LLD "\n",
 + 	       (unsigned long) now, inrate, outrate, inrate, outrate);
 +@@ -2114,6 +2117,7 @@
 + 	      history[x].in = rand () % atoi (argv[argi + 1]);
 + 	      history[x].out = rand () % atoi (argv[argi + 2]);
 + 	    }
 ++	   /* fallthrough */
 + 	case 'u':		/* Update file */
 + 	  if (argv[argi][1] == 'p')
 + 	    {
 
 --------------090800080601000900090905--