Changeset 1145

Timestamp:

11/15/07 07:43:14 (1 year ago)

Author:

shawnw

Message:

#7482: Force low match_limit setting with sys pcre

Files:

• 1.8.3/branches/devel/hdrs/mypcre.h (modified) (3 diffs)
• 1.8.3/branches/devel/src/funlist.c (modified) (17 diffs)
• 1.8.3/branches/devel/src/parse.c (modified) (1 diff)
• 1.8.3/branches/devel/src/pcre.c (modified) (3 diffs)
• 1.8.3/branches/devel/src/wild.c (modified) (6 diffs)

1.8.3/branches/devel/hdrs/mypcre.h

@@ +1 @@
+#ifndef _MYPCRE_H
+#define _MYPCRE_H
+
-/*************************************************
-*       Perl-Compatible Regular Expressions      *
@@ -40 +43 @@
-   pcre.c for details. */
-
+
+#define PENN_MATCH_LIMIT 100000
+struct pcre_extra;
+void set_match_limit(struct pcre_extra *);
+struct pcre_extra * default_match_limit(void);
+
-#ifdef HAVE_PCRE
-#include <pcre.h>
-#else
-
-#ifndef _PCRE_H
-#define _PCRE_H
-
-#define PCRE_MAJOR          6
@@ -205 +212 @@
-}                               /* extern "C" */
-#endif
+#endif                          /* !HAVE_PCRE */
-#endif                          /* End of pcre.h */
-
+

1.8.3/branches/devel/src/funlist.c

@@ -2675 +2675 @@
-{
-  pcre *re;
-
+extra, *
-  const char *errptr;
-  int subpatterns;
@@ -2747 +2747 @@
-      study = pcre_study(re, 0, &errptr);
-      if (errptr != NULL) {
-(Malloc_t) 
+
-        safe_str(T("#-1 REGEXP ERROR: "), buff, bp);
-        safe_str(errptr, buff, bp);
@@ -2759 +2759 @@
-    }
-
+    if (study) {
+      extra = study;
+      set_match_limit(extra);
+    } else
+      extra = default_match_limit();
+
-    search = 0;
-    /* Do all the searches and replaces we can */
-
-    start = prebuf;
-study
+extra
-
-    /* Match wasn't found... we're done */
-    if (subpatterns < 0) {
-      safe_str(prebuf, postbuf, &postp);
-(Malloc_t) 
+
-      free_ansi_string(orig);
-      if (study)
-(Malloc_t) 
+
-      continue;
-    }
@@ -2805 +2811 @@
-        match_offset++;
-    } while (all && match_offset < prelen &&
-study
+extra
-                                      match_offset, 0, offsets, 99)) >= 0);
-
@@ -2811 +2817 @@
-    *postp = '\0';
-
-(Malloc_t) 
+
-    if (study != NULL)
-(Malloc_t) 
+
-    free_ansi_string(orig);
-  }
@@ -2849 +2855 @@
-        study = pcre_study(re, 0, &errptr);
-        if (errptr != NULL) {
-(Malloc_t) 
+
-          safe_str(T("#-1 REGEXP ERROR: "), buff, bp);
-          safe_str(errptr, buff, bp);
@@ -2860 +2866 @@
-          add_check("pcre.extra");
-      }
+      if (study) {
+        extra = study;
+        set_match_limit(extra);
+      } else
+        extra = default_match_limit();
+
-      search = 0;
-      /* Do all the searches and replaces we can */
-      do {
-        subpatterns =
-study
+extra
-        if (subpatterns >= 0) {
-          /* We have a match */
@@ -2901 +2913 @@
-        }
-      } while (subpatterns >= 0 && all);
-(Malloc_t) 
+
-      if (study != NULL)
-(Malloc_t) 
+
-    }
-    safe_ansi_string(orig, 0, orig->len, buff, bp);
@@ -2932 +2944 @@
-  char *qregs[NUMQ], *holder[NUMQ];
-  pcre *re;
+  pcre_extra *extra;
-  const char *errptr;
-  int erroffset;
@@ -2965 +2978 @@
-  }
-  add_check("pcre");
-
+
+
+
-  safe_integer(subpatterns >= 0, buff, bp);
-
@@ -3050 +3065 @@
-  }
-  for (i = 0; i < nqregs; i++) {
-(Malloc_t) 
-
-(Malloc_t) 
+
+
+
-  free_ansi_string(as);
-}
@@ -3074 +3089 @@
-  int erroffset;
-  int flags = 0;
-
+
-  dbref it = match_thing(executor, args[0]);
+
-  reharg.first = 0;
-  if (it == NOTHING || it == AMBIGUOUS) {
@@ -3110 +3126 @@
-    return;
-  }
-
+ {
-    add_check("pcre.extra");
-
+
+
+
+
+
+
+
-  reharg.buff = buff;
-  reharg.bp = bp;
@@ -3118 +3140 @@
-  atr_iter_get(executor, it, args[1], 0, regrep_helper, (void *) &reharg);
-  mush_free(reharg.re, "pcre");
-reharg.
+free_
-    mush_free(reharg.study, "pcre.extra");
-}
@@ -3154 +3176 @@
-  size_t rlen;
-  pcre *re;
-
+, *extra
-  const char *errptr;
-  int erroffset;
@@ -3195 +3217 @@
-    return;
-  }
-
+ {
-    add_check("pcre.extra");
+    extra = study;
+    set_match_limit(extra);
+  } else
+    extra = default_match_limit();
-
-  do {
-    r = remove_markup(split_token(&s, sep), &rlen);
-study
+extra
-      if (all && *bp != b)
-        safe_str(osep, buff, bp);
@@ -3209 +3235 @@
-  } while (s);
-
-(Malloc_t) 
+
-  if (study)
-(Malloc_t) 
-
+
+

1.8.3/branches/devel/src/parse.c

@@ -269 +269 @@
-    re = pcre_compile("^#-?\\d+(?::\\d+)?$", 0, &errptr, &erroffset, NULL);
-  val = remove_markup((const char *) str, &vlen);
-(pcre_exec(re, NULL, val, vlen - 1, 0, 0, NULL, 0) >= 0)
+pcre_exec(re, NULL, val, vlen - 1, 0, 0, NULL, 0) >= 0
-}
-

1.8.3/branches/devel/src/pcre.c

@@ -45 +45 @@
- * 'isblank' as a variable (reported to Philip Hazel for pcre 4.5) */
-
+#include <string.h>
-#include "config.h"
+#include "mypcre.h"
-
-/* Only use if a system libpcre isn't present. */
@@ -57 +59 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "mypcre.h"
-#include "confmagic.h"
-#undef min
@@ -9226 +9226 @@
-
-#endif /* !HAVE_PCRE */
+
+/** Return a default pcre_extra pointer pointing to a static region
+    set up to use a fairly low match-limit setting.
+*/
+struct pcre_extra *
+default_match_limit(void)
+{
+  static struct pcre_extra ex;
+  memset(&ex, 0, sizeof ex);
+  set_match_limit(&ex);
+  return &ex;
+}
+  
+
+/** Set a low match-limit setting in an existing pcre_extra struct. */
+void
+set_match_limit(struct pcre_extra *ex)
+{
+  if (!ex)
+    return;
+  ex->flags |= PCRE_EXTRA_MATCH_LIMIT;
+  ex->match_limit = PENN_MATCH_LIMIT;
+}
+

1.8.3/branches/devel/src/wild.c

@@ -516 +516 @@
-{
-  pcre *re;
+  pcre_extra *extra;
-  size_t i;
-  const char *errptr;
@@ -538 +539 @@
-  add_check("pcre");
-  d = remove_markup(val, &delenn);
+  extra = default_match_limit();
-  /*
-   * Now we try to match the pattern. The relevant fields will
-   * automatically be filled in by this.
-   */
-NULL
+extra
-      < 0) {
-    mush_free(re, "pcre");
@@ -592 +594 @@
-{
-  pcre *re;
+  pcre_extra *extra;
-  const char *sptr;
-  size_t slen;
@@ -616 +619 @@
-  add_check("pcre");
-  sptr = remove_markup(d, &slen);
+  extra = default_match_limit();
-  /*
-   * Now we try to match the pattern. The relevant fields will
-   * automatically be filled in by this.
-   */
-NULL
+extra
-
-  mush_free(re, "pcre");
@@ -637 +641 @@
-  int len;
-  int offsets[99];
+  pcre_extra *extra;
-
-  if (!re || !subj)
@@ -642 +647 @@
-
-  len = strlen(subj);
-
-
-
+
+
-}
-