Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: zsh/pcre module causes core dump w/cvs co as of 2007-04-02
- X-seq: zsh-workers 23264
- From: Clint Adams <clint@xxxxxxx>
- To: zsh-workers@xxxxxxxxxx
- Subject: Re: zsh/pcre module causes core dump w/cvs co as of 2007-04-02
- Date: Thu, 5 Apr 2007 12:16:28 -0400
- In-reply-to: <070404081343.ZM9674@xxxxxxxxxxxxxxxxxxxxxx>
- Mail-followup-to: zsh-workers@xxxxxxxxxx
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <070402230029.ZM7255@xxxxxxxxxxxxxxxxxxxxxx> <20070404114533.GA8303@xxxxxxxxxxx> <070404081343.ZM9674@xxxxxxxxxxxxxxxxxxxxxx>
On Wed, Apr 04, 2007 at 08:13:43AM -0700, Bart Schaefer wrote:
> I wouldn't think so, but I'm not sure what that was supposed to achieve.
I haven't a clue. Maybe it'd be better to prevent the module from being
loadable at all.
Index: Src/Modules/pcre.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/pcre.c,v
retrieving revision 1.10
diff -u -r1.10 pcre.c
--- Src/Modules/pcre.c 30 May 2006 22:35:03 -0000 1.10
+++ Src/Modules/pcre.c 5 Apr 2007 16:12:59 -0000
@@ -189,13 +189,16 @@
return 0;
}
+static struct conddef cotab[] = {
+ CONDDEF("pcre-match", CONDF_INFIX, cond_pcre_match, 0, 0, CPCRE_PLAIN)
+};
+
/**/
#else /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
# define bin_pcre_compile bin_notavail
# define bin_pcre_study bin_notavail
# define bin_pcre_match bin_notavail
-# define cond_pcre_match cond_match
/**/
#endif /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
@@ -206,10 +209,6 @@
BUILTIN("pcre_match", 0, bin_pcre_match, 1, 2, 0, "a", NULL)
};
-static struct conddef cotab[] = {
- CONDDEF("pcre-match", CONDF_INFIX, cond_pcre_match, 0, 0, CPCRE_PLAIN)
-};
-
/**/
int
@@ -222,8 +221,12 @@
int
boot_(Module m)
{
+#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab)) ||
!addconddefs(m->nam, cotab, sizeof(cotab)/sizeof(*cotab));
+#else /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
+ return !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
+#endif /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
}
/**/
@@ -231,7 +234,9 @@
cleanup_(Module m)
{
deletebuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
+#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
deleteconddefs(m->nam, cotab, sizeof(cotab)/sizeof(*cotab));
+#endif /* !(HAVE_PCRE_COMPILE && HAVE_PCRE_EXEC) */
return 0;
}
Messages sorted by:
Reverse Date,
Date,
Thread,
Author