Commit Graph

92 Commits

Author SHA1 Message Date
Stanislav Malyshev
7dde353ee7 Merge branch 'PHP-5.5' into PHP-5.6.23
* PHP-5.5:
  Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
  update NEWS
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298	pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

Conflicts:
	configure.in
	ext/mcrypt/mcrypt.c
	ext/spl/spl_directory.c
	main/php_version.h
2016-06-21 00:01:48 -07:00
Stanislav Malyshev
5b597a2e5b Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free 2016-06-18 21:48:39 -07:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Yasuo Ohgaki
997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:30:59 -07:00
Moriyoshi Koizumi
20eb33b321 mb_split() can now handle empty matches like preg_split() does. 2013-02-10 15:05:17 +09:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
16fbcf7188 - Fix the fix (thanks Chris Jones!) 2011-11-22 19:18:34 +00:00
Felipe Pena
18768584e2 - Fixed possible crash in mb_ereg_search_init() using empty pattern 2011-11-21 19:15:18 +00:00
Xinchen Hui
c8ff0fe254 Fix #55819 crash on mb_ereg_replace_callback
Need hirokawa to review this.
2011-10-07 04:24:04 +00:00
Rui Hirokawa
9b1c6035d2 fixed seg faults for mb_ereg_replace_callback. 2011-09-25 08:33:43 +00:00
Rui Hirokawa
1297c0508a added mb_ereg_replace_callback(). 2011-09-25 08:01:54 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Dmitry Stogov
b65f1dae41 Reduced overhead of ext/mbstring initialization 2010-07-05 12:03:08 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Matt Wilmas
d55300298e MFH: Added zend_eval_stringl and made create_function(), etc. binary-safe 2009-06-05 18:50:32 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Moriyoshi Koizumi
8fe2cb8ced - MFH: Properly initialize/finalize the library. This plugs the leaks caused by
onig_new().
2008-09-13 02:33:15 +00:00
Moriyoshi Koizumi
9225429040 - MFH: Fix warnings 2008-07-25 14:04:54 +00:00
Moriyoshi Koizumi
90f9a8e457 - Remove duplicated lines. 2008-07-22 09:18:30 +00:00
Moriyoshi Koizumi
f78da21527 - MFH: Removed dependencies from php_mbregex to oniguruma types 2008-07-17 16:08:37 +00:00
Moriyoshi Koizumi
88318e0294 - MFH: Added a new configure option --with-onig=[DIR] that allows the extension
to link to the external oniguruma library.
- MFH: Prevent libmbfl files from being installed when --with-libmbfl is
  specified.
2008-07-16 02:30:49 +00:00
Jani Taskinen
0cd842e51b nuke unused variable 2008-07-11 13:50:43 +00:00
Antony Dovgal
e035184017 string length -> int 2008-07-01 07:54:30 +00:00
Alexey Zakhlestin
1c77f59429 updated to the new parameter-parsing api 2008-06-28 21:23:08 +00:00
Rui Hirokawa
ad400f1144 fixed #43994 mb_ereg 'successfully' matching incorrectly. 2008-02-16 11:46:03 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Jani Taskinen
3e0680f2ee MFH:- Fixed bug #31911 (mb_ereg*_replace() crashes when replacement string is invalid
PHP expression and 'e' option is used)
2007-11-16 12:26:34 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Antony Dovgal
ed30473f7c MFH 2007-01-11 22:23:20 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
2f467baf94 MFH 2006-10-11 11:53:02 +00:00
Antony Dovgal
a81eae5d01 MFH: fix segfault/leak, add test 2006-10-11 11:09:42 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Rui Hirokawa
c30f4ab6ec oniguruma updated to 3.7.1 and changed UChar to OnigUChar. 2005-03-19 08:52:23 +00:00
Moriyoshi Koizumi
01c0d589ef - Fix bug #30868 (evaluated pointer comparison in mbregex causes compile
failure).
2005-02-21 10:19:11 +00:00
Moriyoshi Koizumi
5b5e012bc2 - Update libmbfl (fixes bug #30549 and #31911).
- Update oniguruma to 3.7.0
2005-02-20 22:18:09 +00:00
Andi Gutmans
56f8195fe5 - Nuke empty_string. It is a reminanent from the time where RETURN_FALSE()
used to return "" and not bool(false). It's not worth keeping it because
  STR_FREE() and zval_dtor() always have to check for it and it slows down
  the general case. In addition, it seems that empty_string has been abused
  quite a lot, and was used not only for setting zval's but generally in
  PHP code instead of "", which wasn't the intention. Last but not least,
  nuking empty_string should improve stability as I doubt every place
  correctly checked if they are not mistakenly erealloc()'ing it or
  calling efree() on it.
  NOTE: Some code is probably broken. Each extension maintainer should
  check and see that my changes are OK. Also, I haven't had time to touch
  PECL yet. Will try and do it tomorrow.
2004-07-19 07:19:50 +00:00
Moriyoshi Koizumi
11b0f469f0 - Upgrade bundled oniguruma regex library to 2.2.2 (Rui, Moriyoshi)
. Supports various encodings such as BIG5, GB2312 and ISO-8859-*
  . Fixes bug #26677 (mbstring compile errors with IRIX)
  . Many thanks to K.Kosako.
- Remove redundant files that are not relevant to the build.
2004-02-28 20:45:27 +00:00
Andi Gutmans
dbeb4158d2 - A belated happy holidays and PHP 5 2004-01-08 08:18:22 +00:00
Moriyoshi Koizumi
f2b36ec52b Fix php_regex_encoding() so it can handle two additional encoding names
mbfilter supports by default.
2003-10-02 07:49:14 +00:00
Moriyoshi Koizumi
83609e0874 Repatch fixes for the problem that was reported at php-dev@php.gr.jp (#884) 2003-09-26 17:43:39 +00:00
Moriyoshi Koizumi
1ee441613d Remove useless mutex code due to the switch to oniguruma. 2003-09-23 20:11:05 +00:00
Rui Hirokawa
ce66e1eb8d fixed wrong string length in mbregex. 2003-09-23 02:47:06 +00:00