Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2019 10:33:59 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512004 - in head/x11/xedit: . files
Message-ID:  <201909141033.x8EAXxZG033115@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Sat Sep 14 10:33:59 2019
New Revision: 512004
URL: https://svnweb.freebsd.org/changeset/ports/512004

Log:
  x11/xedit: Fix segfault with missing tags file

Added:
  head/x11/xedit/files/
  head/x11/xedit/files/patch-util.c   (contents, props changed)
Modified:
  head/x11/xedit/Makefile

Modified: head/x11/xedit/Makefile
==============================================================================
--- head/x11/xedit/Makefile	Sat Sep 14 10:04:49 2019	(r512003)
+++ head/x11/xedit/Makefile	Sat Sep 14 10:33:59 2019	(r512004)
@@ -2,12 +2,18 @@
 
 PORTNAME=	xedit
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Simple text editor for X
 
-XORG_CAT=	app
-USE_XORG=	xt xaw7
+LICENSE=	MIT BSD3CLAUSE
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		xorg-cat:app xorg
+
+USE_XORG=	x11 xmu xt xaw7
 
 .include <bsd.port.mk>

Added: head/x11/xedit/files/patch-util.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/xedit/files/patch-util.c	Sat Sep 14 10:33:59 2019	(r512004)
@@ -0,0 +1,27 @@
+--- util.c.orig	2015-02-21 21:42:33 UTC
++++ util.c
+@@ -506,13 +506,14 @@ ResolveName(char *filename)
+ 
+     if (result == NULL && errno == ENOENT) {
+ 	int	length;
+-	char	*dir, *file;
++	char	*dir, *file, *fname;
+ 
+ 	length = strlen(filename);
+ 	tmp = dir = XtMalloc(length + 1);
+ 	strcpy(dir, filename);
++	fname = strdup(filename);
+ 
+-	file = basename(filename);
++	file = basename(fname);
+ 	dir = dirname(tmp);
+ 
+ 	/* Creating a new file? */
+@@ -526,6 +527,7 @@ ResolveName(char *filename)
+ 	}
+ 
+ 	XtFree(tmp);
++	free(fname);
+     }
+ 
+     return (result);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909141033.x8EAXxZG033115>