From e8107dc433a6a59372e032555b01b70c589f1aac Mon Sep 17 00:00:00 2001
From: anray <anray@FreeBSD.org>
Date: Wed, 15 Nov 2006 11:31:35 +0000
Subject: Fix areafix and ftntick crashes.

---
 news/fidogate-ds/Makefile              |  1 +
 news/fidogate-ds/files/patch-areafix.c | 17 +++++++++++++++++
 news/fidogate-ds/files/patch-ftntick.c | 17 +++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 news/fidogate-ds/files/patch-areafix.c
 create mode 100644 news/fidogate-ds/files/patch-ftntick.c

(limited to 'news')

diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index 6a48463..e22aa08 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		fidogate
 PORTVERSION=		5.1.5
+PORTREVISION=		1
 CATEGORIES=		news mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rusfidogate
diff --git a/news/fidogate-ds/files/patch-areafix.c b/news/fidogate-ds/files/patch-areafix.c
new file mode 100644
index 0000000..e844416
--- /dev/null
+++ b/news/fidogate-ds/files/patch-areafix.c
@@ -0,0 +1,17 @@
+Index: src/areafix/areafix.c
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/areafix/areafix.c,v
+retrieving revision 5.5
+retrieving revision 5.6
+diff -u -r5.5 -r5.6
+--- src/areafix/areafix.c	26 Feb 2006 15:48:31 -0000	5.5
++++ src/areafix/areafix.c	15 Nov 2006 09:15:36 -0000	5.6
+@@ -1946,7 +1946,7 @@
+ 	for (a=uplinks_lookup (areafix, area); a; a=a->next)
+ 	{
+ 		/* Create area */
+-		if (a->options)
++		if (a != NULL && a->options != NULL)
+ 		    BUF_COPY3( buf, a->areas, " ", a->options );
+ 		else
+ 		    BUF_COPY( buf,  a->areas );
diff --git a/news/fidogate-ds/files/patch-ftntick.c b/news/fidogate-ds/files/patch-ftntick.c
new file mode 100644
index 0000000..dbbc315
--- /dev/null
+++ b/news/fidogate-ds/files/patch-ftntick.c
@@ -0,0 +1,17 @@
+Index: src/tick/ftntick.c
+===================================================================
+RCS file: /cvsroot/rusfidogate/fidogate-sta/src/tick/ftntick.c,v
+retrieving revision 5.2
+retrieving revision 5.3
+diff -u -r5.2 -r5.3
+--- src/tick/ftntick.c	23 Nov 2005 23:12:22 -0000	5.2
++++ src/tick/ftntick.c	15 Nov 2006 08:59:25 -0000	5.3
+@@ -370,7 +370,7 @@
+ 	    }
+ 	    
+ 	    a = uplinks_line_get(FALSE, &tic->from);
+-	    if(a->options)
++	    if(a != NULL && a->options != NULL)
+ 	    {
+ 	    	tmp = (char*) xmalloc(strlen(tic->area)
+ 				      + strlen(autocreate_line)
-- 
cgit v1.1