upgrade to Oniguruma 6.1.2

Author: weltling

ext/mbstring/config.m4

@@ -108,49 +108,61 @@ int main() { return foo(10, "", 3.14); }
       PHP_MBSTRING_ADD_BUILD_DIR([oniguruma])
       PHP_MBSTRING_ADD_BUILD_DIR([oniguruma/enc])
       PHP_MBSTRING_ADD_INCLUDE([oniguruma])
-      PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/config.h])
+      PHP_MBSTRING_ADD_CONFIG_HEADER([oniguruma/src/config.h])
       PHP_MBSTRING_ADD_SOURCES([
-        oniguruma/regcomp.c
-        oniguruma/regerror.c
-        oniguruma/regexec.c
-        oniguruma/reggnu.c
-        oniguruma/regparse.c
-        oniguruma/regenc.c
-        oniguruma/regext.c
-        oniguruma/regsyntax.c
-        oniguruma/regtrav.c
-        oniguruma/regversion.c
-        oniguruma/st.c
-        oniguruma/enc/unicode.c
-        oniguruma/enc/ascii.c
-        oniguruma/enc/utf8.c
-        oniguruma/enc/euc_jp.c
-        oniguruma/enc/euc_tw.c
-        oniguruma/enc/euc_kr.c
-        oniguruma/enc/sjis.c
-        oniguruma/enc/iso8859_1.c
-        oniguruma/enc/iso8859_2.c
-        oniguruma/enc/iso8859_3.c
-        oniguruma/enc/iso8859_4.c
-        oniguruma/enc/iso8859_5.c
-        oniguruma/enc/iso8859_6.c
-        oniguruma/enc/iso8859_7.c
-        oniguruma/enc/iso8859_8.c
-        oniguruma/enc/iso8859_9.c
-        oniguruma/enc/iso8859_10.c
-        oniguruma/enc/iso8859_11.c
-        oniguruma/enc/iso8859_13.c
-        oniguruma/enc/iso8859_14.c
-        oniguruma/enc/iso8859_15.c
-        oniguruma/enc/iso8859_16.c
-        oniguruma/enc/koi8.c
-        oniguruma/enc/koi8_r.c
-        oniguruma/enc/big5.c
-        oniguruma/enc/utf16_be.c
-        oniguruma/enc/utf16_le.c
-        oniguruma/enc/utf32_be.c
-        oniguruma/enc/utf32_le.c
+		oniguruma/src/ascii.c
+                oniguruma/src/big5.c
+                oniguruma/src/cp1251.c
+                oniguruma/src/euc_jp.c
+                oniguruma/src/euc_jp_prop.c
+                oniguruma/src/euc_kr.c
+                oniguruma/src/euc_tw.c
+                oniguruma/src/gb18030.c
+                oniguruma/src/iso8859_1.c
+                oniguruma/src/iso8859_10.c
+                oniguruma/src/iso8859_11.c
+                oniguruma/src/iso8859_13.c
+                oniguruma/src/iso8859_14.c
+                oniguruma/src/iso8859_15.c
+                oniguruma/src/iso8859_16.c
+                oniguruma/src/iso8859_2.c
+                oniguruma/src/iso8859_3.c
+                oniguruma/src/iso8859_4.c
+                oniguruma/src/iso8859_5.c
+                oniguruma/src/iso8859_6.c
+                oniguruma/src/iso8859_7.c
+                oniguruma/src/iso8859_8.c
+                oniguruma/src/iso8859_9.c
+                oniguruma/src/koi8.c
+                oniguruma/src/koi8_r.c
+                oniguruma/src/onig_init.c
+                oniguruma/src/regcomp.c
+                oniguruma/src/regenc.c
+                oniguruma/src/regerror.c
+                oniguruma/src/regexec.c
+                oniguruma/src/regext.c
+                oniguruma/src/reggnu.c
+                oniguruma/src/regparse.c
+                oniguruma/src/regposerr.c
+                oniguruma/src/regposix.c
+                oniguruma/src/regsyntax.c
+                oniguruma/src/regtrav.c
+                oniguruma/src/regversion.c
+                oniguruma/src/sjis.c
+                oniguruma/src/sjis_prop.c
+                oniguruma/src/st.c
+                oniguruma/src/unicode.c
+                oniguruma/src/unicode_fold1_key.c
+                oniguruma/src/unicode_fold2_key.c
+                oniguruma/src/unicode_fold3_key.c
+                oniguruma/src/unicode_unfold_key.c
+                oniguruma/src/utf16_be.c
+                oniguruma/src/utf16_le.c
+                oniguruma/src/utf32_be.c
+                oniguruma/src/utf32_le.c
+                oniguruma/src/utf8.c
       ])
+      cp $ext_builddir/oniguruma/src/oniguruma.h $ext_builddir/oniguruma/oniguruma.h
       PHP_MBSTRING_ADD_INSTALL_HEADERS([oniguruma/oniguruma.h])
     else
       dnl

ext/mbstring/config.w32

@@ -10,6 +10,9 @@ if (PHP_MBSTRING != "no") {
 
 	EXTENSION("mbstring", "mbstring.c php_unicode.c mb_gpc.c", PHP_MBSTRING_SHARED);
 
+	FSO.CopyFile("ext\\mbstring\\oniguruma\\src\\oniguruma.h",
+		"ext\\mbstring\\oniguruma\\oniguruma.h", true);
+
 	if (PHP_LIBMBFL != "no" &&
 			CHECK_HEADER_ADD_INCLUDE("mbfl/mbfilter.h", "CFLAGS_LIBMBFL", PHP_LIBMBFL + "\\include") &&
 			CHECK_LIB("mbfl.lib", "libmbfl", PHP_LIBMBFL + "\\lib")) {
@@ -74,8 +77,13 @@ if (PHP_MBSTRING != "no") {
 	AC_DEFINE('HAVE_MBSTR_RU', 1, 'RU');
 	AC_DEFINE('HAVE_MBSTR_TW', 1, 'TW');
 
-	FSO.CopyFile("ext\\mbstring\\oniguruma\\win32\\config.h",
-		"ext\\mbstring\\oniguruma\\config.h", true);
+	if (X64) {
+		FSO.CopyFile("ext\\mbstring\\oniguruma\\src\\config.h.win64",
+			"ext\\mbstring\\oniguruma\\src\\config.h", true);
+	} else {
+		FSO.CopyFile("ext\\mbstring\\oniguruma\\src\\config.h.win32",
+			"ext\\mbstring\\oniguruma\\src\\config.h", true);
+	}
 
 	if (PHP_MBREGEX != "no") {
 		AC_DEFINE('HAVE_STDARG_PROTOTYPES', 1, 'have stdarg.h');
@@ -84,16 +92,7 @@ if (PHP_MBSTRING != "no") {
 		if (PHP_MBREGEX_BACKTRACK != "no") {
 			AC_DEFINE('USE_COMBINATION_EXPLOSION_CHECK', 1);
 		}
-		ADD_SOURCES("ext/mbstring/oniguruma", "regcomp.c regerror.c \
-			regenc.c regexec.c reggnu.c regparse.c regposerr.c \
-			regext.c regsyntax.c regtrav.c regversion.c st.c", "mbstring");
-		ADD_SOURCES("ext/mbstring/oniguruma/enc", "ascii.c big5.c \
-			euc_jp.c euc_kr.c euc_tw.c iso8859_1.c iso8859_2.c \
-			iso8859_3.c iso8859_4.c iso8859_5.c iso8859_6.c \
-			iso8859_7.c iso8859_8.c iso8859_9.c iso8859_10.c \
-			iso8859_11.c iso8859_13.c iso8859_14.c iso8859_15.c iso8859_16.c \
-			koi8.c koi8_r.c sjis.c utf8.c unicode.c utf16_be.c utf16_le.c \
-			utf32_be.c utf32_le.c gb18030.c", "mbstring");
+		ADD_SOURCES("ext/mbstring/oniguruma/src", "ascii.c big5.c cp1251.c euc_jp.c euc_jp_prop.c euc_kr.c euc_tw.c gb18030.c iso8859_1.c iso8859_10.c iso8859_11.c iso8859_13.c iso8859_14.c iso8859_15.c iso8859_16.c iso8859_2.c iso8859_3.c iso8859_4.c iso8859_5.c iso8859_6.c iso8859_7.c iso8859_8.c iso8859_9.c koi8.c koi8_r.c mktable.c onig_init.c regcomp.c regenc.c regerror.c regexec.c regext.c reggnu.c regparse.c regposerr.c regposix.c regsyntax.c regtrav.c regversion.c sjis.c sjis_prop.c st.c unicode.c unicode_fold1_key.c unicode_fold2_key.c unicode_fold3_key.c unicode_unfold_key.c utf16_be.c utf16_le.c utf32_be.c utf32_le.c utf8.c", "mbstring");
 		ADD_SOURCES("ext/mbstring", "php_mbregex.c", "mbstring");
 		PHP_INSTALL_HEADERS("ext/mbstring", "php_mbregex.h");
 	}

ext/mbstring/oniguruma/AUTHORS

@@ -1 +1 @@
-sndgk393 AT ybb DOT ne DOT jp (K.Kosako)
+<[email protected]> (K.Kosako)

ext/mbstring/oniguruma/COPYING

@@ -2,7 +2,7 @@ Oniguruma LICENSE
 -----------------
 
 /*-
- * Copyright (c) 2002-2007  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2015  K.Kosako  <[email protected]>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

ext/mbstring/oniguruma/ChangeLog

@@ -1,5 +1,63 @@
 History
 
+2016/11/07: Version 6.1.2
+
+2016/10/25: allow word bound, word begin and word end in look-behind.
+2016/10/19: add ONIG_OPTION_CHECK_VALIDITY_OF_STRING option.
+2016/10/16: fix use after free node.
+2016/10/10: fix memory leaks after parsing regexp error.
+2016/09/22: implement many of is_valid_mbc_string().
+
+2016/09/02: Version 6.1.1
+
+2016/08/31: fix segfault /W.?{888}{888}{888}\x00/ (found by libfuzzer)
+2016/08/31: fix error unmatched close parenthesis for %{(.*?)} #23
+
+2016/08/29: Version 6.1.0
+
+2016/08/28: add contributed/libfuzzer-onig.cpp  (thanks hannob)
+2016/08/28: update LTVERSION 4:0:0
+2016/08/28: NEW API: onigenc_is_valid_mbc_string().
+2016/08/27: add is_valid_mbc_string() member into OnigEncodingType.
+2016/08/27: fix out of bounds read.
+2016/08/26: fix out of bounds read.
+2016/08/25: disable USE_INVALID_CODE_SCHEME.
+2016/08/24: fix out of bounds read.
+2016/08/23: doc/RE improved.
+2016/08/22: add onig_scan() into doc/API.
+2016/08/22: fix bug: Out of bounds read in onig_strcpy() #17
+2016/08/21: fix bug: infinite loop of backreference and group.
+2016/08/21: fix out of bounds read in mbc_to_code() #16
+2016/08/18: doc/RE refinements.
+2016/08/16: add onig_scan() (NEW API)
+2016/08/16: reimplement match stack allocation for case too many repeat
+            and too many captures in regexp.
+2016/08/15: number of captures <= 32767 for bytecode representation.
+2016/07/17: don't use int_map_backward for thread-safe.
+2016/07/04: fix case of enclosed option in look-behind.
+2016/07/04: fix ignore case in look-behind.
+2016/05/23: fix memory leak in onig_unicode_define_user_property()
+2016/05/20: declare variables at the top of scope.  (thanks nmaya)
+
+2016/05/09: Version 6.0.0
+
+2016/05/05: add NEW API: onig_unicode_define_user_property()
+2016/05/04: update Unicode data to 8.0.0
+2016/05/02: change OnigCodePoint type to unsigned int.
+2016/05/02: add doc/UNICODE_PROPERTIES.
+2016/04/19: add error code ONIGERR_FAIL_TO_INITIALIZE.
+2016/04/18: add make_win64/32.bat.
+2016/04/18: fix bug of uninitialized regex_t value on error.
+2016/04/16: reimplement Unicode case folding.
+2016/04/11: update LTVERSION = 3.0.0
+2016/04/05: remove all THREAD_ macro.
+2016/04/05: add init member into OnigEncoding. (add onig_initialize())
+2016/03/28: remove state member of regex.
+2016/03/25: move source files into src/
+2016/03/23: rename configre.in to configure.ac.
+2015/11/17: fix memory leak. (thanks pigzang)
+2015/07/13: change mail address.
+
 2014/12/12: Version 5.9.6
 
 2013/11/27: [impl] add onigenc_end_unicode().  (thanks Takenori Imoto)
@@ -288,7 +346,7 @@ History
 2006/10/10: [impl] remove OP_WORD_SB and OP_WORD_MB.
 2006/10/10: [impl] remove OP_EXACT1_IC and OP_EXACTN_IC from match_at().
 2006/10/10: [impl] should free new_str in expand_case_fold_string().
-2006/10/06: [dist] add test entrys to sample/encode.c.
+2006/10/06: [dist] add test entries to sample/encode.c.
 2006/10/06: [impl] re-implement caseless match (case-fold).
 2006/10/06: [impl] expand string node by case fold variations.
                    add expand_case_fold_string().
@@ -857,7 +915,7 @@ History
 2004/11/16: [impl] add get_type_cc_node method to OnigEncodingType.
 2004/11/15: [impl] add st.h and st.c from Ruby 1.9.
                    use st-hash always.
-2004/11/12: [impl] change menber 'not' of CClassNode to 'flags'.
+2004/11/12: [impl] change member 'not' of CClassNode to 'flags'.
                    add flags FLAG_CCLASS_NOT and FLAG_CCLASS_SHARE.
 2004/11/12: [impl] add onig_is_in_code_range_array() to enc/unicode.c.
 2004/11/12: [impl] fix CRWord in enc/unicode.c and MBWord in enc/utf8.c.
@@ -902,7 +960,7 @@ History
 2004/10/18: [impl] (thanks Imai Yasumasa)
                    enclose #include <sys/types.h> by #ifndef __BORLANDC__.
 2004/10/18: [bug]  (thanks Imai Yasumasa)
-                   memory acess violation in select_opt_exact_info().
+                   memory access violation in select_opt_exact_info().
 2004/09/25: [dist] fix doc/API and doc/API.ja.
 2004/09/25: [bug]  fix OP_SEMI_END_BUF process in match_at() for
                    the case USE_NEWLINE_AT_END_OF_STRING_HAS_EMPTY_LINE
@@ -1113,7 +1171,7 @@ History
 2004/04/15: [new]  add onig_get_ambig_flag().
 2004/04/14: [bug]  (thanks Isao Sonobe)
                    undefined bytecode error happens if ONIG_OPTION_FIND_LONGEST
-                   is setted.
+                   is set.
                    should finish matching process if find-condition
                    is fail at OP_END in match_at().
 2004/04/12: [impl] add ambig_flag to regex_t.
@@ -1671,7 +1729,7 @@ History
 2003/03/12: [spec] change named backref and subexp call format.
                    backref: \k<name>, call: \g<name>     (thanks akr)
 2003/03/11: [inst] add regparse.[ch] in win32/Makefile.
-2003/03/11: [bug]  if UNALIGNED_WORD_ACCESS isn't setted
+2003/03/11: [bug]  if UNALIGNED_WORD_ACCESS isn't set,
                    then compile error in unset_addr_list_fix().  (thanks knu)
 2003/03/10: [impl] divide regcomp.c to regcomp.c, regparse.c and regparse.h.
 2003/03/10: [bug]  should handle multi-byte code name in fetch_name().
@@ -1738,7 +1796,7 @@ History
 2003/02/28: [impl] add opcode OP_CALL, OP_RETURN.
                    add stack type STK_CALL_FRAME, STK_RETURN, STK_MEM_END.
 2003/02/26: [spec] add new syntax behavior REG_SYN_STRICT_CHECK_BACKREF_NUMBER.
-                   if it is setted, then error /(\1)/, /\1(..)/ etc...
+                   if it is set, then error /(\1)/, /\1(..)/ etc...
 2003/02/26: [spec] if backref number is greater than max group number,
                    then return compile error. (REGERR_INVALID_BACKREF_NUMBER)
 2003/02/26: [tune] bad implemented N_ALT case in get_min_match_length().