* include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0. fixes

some memory violation. [ruby-dev:31070] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
iain · Jul 23, 2007 · e1def8a · e1def8a
1 parent 46eb6e9
commit e1def8a
Show file tree

Hide file tree

Showing 14 changed files with 1,392 additions and 1,411 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 23 18:37:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* include/ruby/oniguruma.h: upgrade to Oniguruma 5.9.0.  fixes
+	  some memory violation.  [ruby-dev:31070]
+
 Sun Jul 22 20:09:49 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (Date._parse): now accepts some new

diff --git a/euc_jp.c b/euc_jp.c
@@ -113,7 +113,7 @@ code_to_mbc(OnigCodePoint code, UChar *buf)
 
 #if 1
   if (enc_len(ONIG_ENCODING_EUC_JP, buf) != (p - buf))
-    return ONIGENCERR_INVALID_WIDE_CHAR_VALUE;
+    return ONIGENC_ERR_INVALID_WIDE_CHAR_VALUE;
 #endif  
   return p - buf;
 }
@@ -234,7 +234,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype)
 
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (unsigned int )PropertyListNum)
-      return ONIGENCERR_TYPE_BUG;
+      return ONIGENC_ERR_TYPE_BUG;
 
     return onig_is_in_code_range((UChar* )PropertyList[ctype], code);
   }
@@ -256,7 +256,7 @@ get_ctype_code_range(int ctype, OnigCodePoint* sb_out,
 
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= PropertyListNum)
-      return ONIGENCERR_TYPE_BUG;
+      return ONIGENC_ERR_TYPE_BUG;
 
     *ranges = PropertyList[ctype];
     return 0;

diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h
@@ -38,7 +38,7 @@ extern "C" {
 
 #define ONIGURUMA
 #define ONIGURUMA_VERSION_MAJOR   5
-#define ONIGURUMA_VERSION_MINOR   7
+#define ONIGURUMA_VERSION_MINOR   9
 #define ONIGURUMA_VERSION_TEENY   0
 
 #ifdef __cplusplus