[ruby-core:33096] [Ruby 1.9-Bug#4014] Case-Sensitivity of Property Names Depends on Regexp Encoding

Issue #4014 has been updated by Yui NARUSE.


Here is the new patch:
diff --git a/regenc.c b/regenc.c
index b9b03b0..4067079 100644
--- a/regenc.c
+++ b/regenc.c
@@ -789,20 +789,20 @@ extern int
 onigenc_minimum_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
   static const PosixBracketEntryType PBS[] = {
-    PosixBracketEntryInit("Alnum",  ONIGENC_CTYPE_ALNUM),
-    PosixBracketEntryInit("Alpha",  ONIGENC_CTYPE_ALPHA),
-    PosixBracketEntryInit("Blank",  ONIGENC_CTYPE_BLANK),
-    PosixBracketEntryInit("Cntrl",  ONIGENC_CTYPE_CNTRL),
-    PosixBracketEntryInit("Digit",  ONIGENC_CTYPE_DIGIT),
-    PosixBracketEntryInit("Graph",  ONIGENC_CTYPE_GRAPH),
-    PosixBracketEntryInit("Lower",  ONIGENC_CTYPE_LOWER),
-    PosixBracketEntryInit("Print",  ONIGENC_CTYPE_PRINT),
-    PosixBracketEntryInit("Punct",  ONIGENC_CTYPE_PUNCT),
-    PosixBracketEntryInit("Space",  ONIGENC_CTYPE_SPACE),
-    PosixBracketEntryInit("Upper",  ONIGENC_CTYPE_UPPER),
-    PosixBracketEntryInit("XDigit", ONIGENC_CTYPE_XDIGIT),
-    PosixBracketEntryInit("ASCII",  ONIGENC_CTYPE_ASCII),
-    PosixBracketEntryInit("Word",   ONIGENC_CTYPE_WORD),
+    PosixBracketEntryInit("alnum",  ONIGENC_CTYPE_ALNUM),
+    PosixBracketEntryInit("alpha",  ONIGENC_CTYPE_ALPHA),
+    PosixBracketEntryInit("blank",  ONIGENC_CTYPE_BLANK),
+    PosixBracketEntryInit("cntrl",  ONIGENC_CTYPE_CNTRL),
+    PosixBracketEntryInit("digit",  ONIGENC_CTYPE_DIGIT),
+    PosixBracketEntryInit("graph",  ONIGENC_CTYPE_GRAPH),
+    PosixBracketEntryInit("lower",  ONIGENC_CTYPE_LOWER),
+    PosixBracketEntryInit("print",  ONIGENC_CTYPE_PRINT),
+    PosixBracketEntryInit("punct",  ONIGENC_CTYPE_PUNCT),
+    PosixBracketEntryInit("space",  ONIGENC_CTYPE_SPACE),
+    PosixBracketEntryInit("upper",  ONIGENC_CTYPE_UPPER),
+    PosixBracketEntryInit("xdigit", ONIGENC_CTYPE_XDIGIT),
+    PosixBracketEntryInit("ascii",  ONIGENC_CTYPE_ASCII),
+    PosixBracketEntryInit("word",   ONIGENC_CTYPE_WORD),
   };
 
   const PosixBracketEntryType *pb, *pbe;
@@ -811,7 +811,7 @@ onigenc_minimum_property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
   len = onigenc_strlen(enc, p, end);
   for (pbe = (pb = PBS) + sizeof(PBS)/sizeof(PBS[0]); pb < pbe; ++pb) {
     if (len == pb->len &&
-        onigenc_with_ascii_strncmp(enc, p, end, pb->name, pb->len) == 0)
+        STRNCASECMP(p, pb->name, pb->len) == 0)
       return pb->ctype;
   }
 
@@ -897,7 +897,9 @@ onigenc_property_list_add_property(UChar* name, const OnigCodePoint* prop,
 {
 #define PROP_INIT_SIZE     16
 
-  int r;
+  int i, r;
+  size_t len;
+  char *propname;
 
   if (*psize <= *pnum) {
     int new_size = (*psize == 0 ? PROP_INIT_SIZE : *psize * 2);
@@ -912,8 +914,14 @@ onigenc_property_list_add_property(UChar* name, const OnigCodePoint* prop,
     if (ONIG_IS_NULL(*table)) return ONIGERR_MEMORY;
   }
 
+  len = strlen((char *)name);
+  propname = ALLOC_N(char, len+1);
+  for (i = 0; i < (int)len; i++) {
+      propname[i] = ONIGENC_ASCII_CODE_TO_LOWER_CASE(name[i]);
+  }
+
   *pnum = *pnum + 1;
-  onig_st_insert_strend(*table, name, name + strlen((char* )name),
+  onig_st_insert_strend(*table, propname, propname + len,
 			(hash_data_type )(*pnum + ONIGENC_MAX_STD_CTYPE));
   return 0;
 }
----------------------------------------
http://redmine.ruby-lang.org/issues/show/4014

----------------------------------------
http://redmine.ruby-lang.org