aboutsummaryrefslogtreecommitdiff
path: root/devel/oniguruma
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2003-08-27 16:06:06 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2003-08-27 16:06:06 +0000
commit150a7d659cbe826070301dac8e8dbb89a3344f44 (patch)
tree698f4ba93df054b3923319da93462e7529263c26 /devel/oniguruma
parenta0097a26ed10e941692ef03e5d3dc3ce419f0d7e (diff)
downloadports-150a7d659cbe826070301dac8e8dbb89a3344f44.tar.gz
ports-150a7d659cbe826070301dac8e8dbb89a3344f44.zip
Notes
Diffstat (limited to 'devel/oniguruma')
-rw-r--r--devel/oniguruma/Makefile1
-rw-r--r--devel/oniguruma/files/patch-regparse.c29
2 files changed, 30 insertions, 0 deletions
diff --git a/devel/oniguruma/Makefile b/devel/oniguruma/Makefile
index 8fcc2a1c434c..992bcaf77c7d 100644
--- a/devel/oniguruma/Makefile
+++ b/devel/oniguruma/Makefile
@@ -7,6 +7,7 @@
PORTNAME= oniguruma
PORTVERSION= 1.9.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_RUBY}
MASTER_SITE_SUBDIR= contrib
diff --git a/devel/oniguruma/files/patch-regparse.c b/devel/oniguruma/files/patch-regparse.c
new file mode 100644
index 000000000000..f0714d214678
--- /dev/null
+++ b/devel/oniguruma/files/patch-regparse.c
@@ -0,0 +1,29 @@
+Obtained from [ruby-dev:21263]
+
+Index: regparse.c
+===================================================================
+--- regparse.c (revision 217)
++++ regparse.c (working copy)
+@@ -3571,7 +3571,10 @@
+ in_israw = 1;
+ val_entry:
+ len = WC2MBLEN(env->enc, v);
+- if (len < 0) return len;
++ if (len < 0) {
++ r = len;
++ goto err;
++ }
+ in_type = (len == 1 ? CCV_SB : CCV_WC);
+ r = next_state_val(cc, &vs, v, &val_israw, in_israw, in_type, &val_type,
+ &state, env);
+@@ -3658,8 +3661,8 @@
+ acc = &(NCCLASS(anode));
+ r = or_cclass(cc, acc);
+
++ regex_node_free(anode);
+ cc_open_err:
+- regex_node_free(anode);
+ if (r != 0) goto err;
+ }
+ break;
+