cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Address crashes related to http://tracker.xemacs.org/XEmacs/its/issue630 [1]

Browse Source 
PR:             ports/140899 [1] (based on)
Submitted by:   Eric Masson <emss@free.fr>
This commit is contained in:
Philip M. Gollucci 2009-12-10 07:29:19 +00:00
parent ba5491bddd
commit 5e5b79ae8c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=245487
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/xemacs/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= xemacs
PORTVERSION= ${XEMACS_VER}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XEMACS}
MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL}
@ -21,6 +21,8 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \
xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
MAKE_JOBS_SAFE= yes
XEMACS_REL= 21.4
XEMACS_VER= 21.4.22
XEMACS_ARCH= ${CONFIGURE_TARGET}
@ -106,7 +108,6 @@ WITH_WIDGETS= --with-widgets=athena
.if defined(WITH_XAW3D)
LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS+= --with-athena=3d
.endif
.endif

37
editors/xemacs/files/patch-src__regex.c Normal file
View File

@ -0,0 +1,37 @@
--- ./src/regex.c.orig 2006-03-31 01:29:00.000000000 +0000
+++ ./src/regex.c 2009-12-10 06:16:16.198040087 +0000
@@ -3106,9 +3107,6 @@
normal_char:
{
/* XEmacs: modifications here for Mule. */
- /* `q' points to the beginning of the next char. */
- re_char *q = p;
-
/* If no exactn currently being built. */
if (!pending_exact
@@ -3116,18 +3114,17 @@
|| pending_exact + *pending_exact + 1 != buf_end
/* We have only one byte following the exactn for the count. */
- || ((unsigned int) (*pending_exact + (q - p)) >=
- ((unsigned int) (1 << BYTEWIDTH) - 1))
+ || *pending_exact >= (1 << BYTEWIDTH) - 1
/* If followed by a repetition operator. */
- || *q == '*' || *q == '^'
+ || (p != pend && (*p == '*' || *p == '^'))
|| ((syntax & RE_BK_PLUS_QM)
- ? *q == '\\' && (q[1] == '+' || q[1] == '?')
- : (*q == '+' || *q == '?'))
+ ? p + 1 < pend && *p == '\\' && (p[1] == '+' || p[1] == '?')
+ : p != pend && (*p == '+' || *p == '?'))
|| ((syntax & RE_INTERVALS)
&& ((syntax & RE_NO_BK_BRACES)
- ? *q == '{'
- : (q[0] == '\\' && q[1] == '{'))))
+ ? p != pend && *p == '{'
+ : p + 1 < pend && (p[0] == '\\' && p[1] == '{'))))
{
/* Start building a new exactn. */