svn commit: r476948 - in head/comms/fldigi: . files

[Stephen Hurd]

Author: shurd
Date: Sat Aug 11 23:32:35 2018
New Revision: 476948
URL: https://svnweb.freebsd.org/changeset/ports/476948

Log:
  Add patch to fix potential crash on startup
  
  Raster::resize() was being called with a negative width or height due to
  bad state being stored in the config.  This resulted in fldigi crashing
  before the UI was displayed.  This patch works around the problem and has
  been submitted upstream.

Added:
  head/comms/fldigi/files/patch-src_waterfall_raster.cxx   (contents, props changed)
Modified:
  head/comms/fldigi/Makefile

Modified: head/comms/fldigi/Makefile
==============================================================================
--- head/comms/fldigi/Makefile	Sat Aug 11 22:28:24 2018	(r476947)
+++ head/comms/fldigi/Makefile	Sat Aug 11 23:32:35 2018	(r476948)
@@ -2,7 +2,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	4.0.17
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 

Added: head/comms/fldigi/files/patch-src_waterfall_raster.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/comms/fldigi/files/patch-src_waterfall_raster.cxx	Sat Aug 11 23:32:35 2018	(r476948)
@@ -0,0 +1,13 @@
+--- src/waterfall/raster.cxx.orig	2018-08-11 23:26:43 UTC
++++ src/waterfall/raster.cxx
+@@ -169,6 +169,10 @@ void Raster::resize(int x, int y, int w,
+ 	while ((Ndest * rhs) < Hdest) Ndest++;
+ 	Ndest--;
+ 
++	if (Wdest < 0)
++		Wdest = 0;
++	if (Hdest < 0)
++		Hdest = 0;
+ 	unsigned char *tempbuf = new unsigned char [Wdest * Hdest];
+ 	unsigned char *oldbuf = vidbuf;
+