aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--regcomp.c2
-rw-r--r--regparse.c1
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bcd9f169a9..639993a7e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jan 28 09:44:19 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * regcomp.c (onig_compile): initialize ScanEnv.
+ mainly to initialize env->warnings_flag [ruby-dev:40196]
+
+ * regparse.c (scan_env_clear): clear warnings_flag.
+
Wed Jan 27 23:33:21 2010 Yusuke Endoh <mame@tsg.ne.jp>
* test/matrix/test_matrix.rb, test/matrix/test_vector.rb: add some
diff --git a/regcomp.c b/regcomp.c
index bfddc225d1..e1ac7ee85c 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -5357,7 +5357,7 @@ onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
int r, init_size;
Node* root;
- ScanEnv scan_env;
+ ScanEnv scan_env = {0};
#ifdef USE_SUBEXP_CALL
UnsetAddrList uslist;
#endif
diff --git a/regparse.c b/regparse.c
index 9f46b15cd4..67da551d38 100644
--- a/regparse.c
+++ b/regparse.c
@@ -956,6 +956,7 @@ scan_env_clear(ScanEnv* env)
env->curr_max_regnum = 0;
env->has_recursion = 0;
#endif
+ env->warnings_flag = 0;
}
static int