Commit Graph

247 Commits

Author SHA1 Message Date
Stanislav Malyshev
13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
2016-01-05 19:38:29 -08:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Stanislav Malyshev
dcf3c9761c Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization) 2015-12-28 14:46:35 -08:00
Stanislav Malyshev
1785d2b805 Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability 2015-12-28 12:44:10 -08:00
manuel
3550cc5fd9 add tests for #68996 2015-02-07 18:52:26 +01:00
manuel
13fc7f20a4 Invalid free of CG(interned_empty_string)
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
2015-02-06 16:53:01 +01: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
Rouven Weßling
417dbfbacc Declare a number of functions as variadic. 2014-02-16 00:07:55 +01: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
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Anatol Belski
95ea1e7ca7 fixed variable corruption under win x64 2013-05-11 02:47:48 +02:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Matt Ficken
a18cede1c5 Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt 2012-06-11 17:00:36 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Dmitry Stogov
4a25a7740d Fixed ZE specific compile warnings (Bug #55629) 2011-09-13 13:29:35 +00:00
Pierre Joye
5d62cd1530 - add skipif 2011-09-05 13:52:24 +00:00
Pierre Joye
493808af3d - add skipif 2011-09-05 13:52:24 +00:00
Pierre Joye
07fae45eb7 - add skipif 2011-09-05 13:41:01 +00:00
Pierre Joye
6b424c19ce - add skipif 2011-09-05 13:41:01 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Felipe Pena
6150174941 - Fixed bug #52468 (wddx_deserialize corrupts integer field value when left empty) 2010-08-01 17:34:09 +00:00
Felipe Pena
88b087bedd - Fixed bug #52468 (wddx_deserialize corrupts integer field value when left empty) 2010-08-01 17:34:09 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Felipe Pena
c353601a3f - MFH: Fixed bug #48562 (Reference recursion causes segfault when used in wddx_serialize_vars()) 2009-06-16 02:54:26 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Mark Karpeles
75b07963e3 - MFH: ext/wddx: classes providing __sleep() are stored without properties (fixed)
- ext/wddx: fixed wddx_add_vars() ignoring first var in php 5.3
2008-11-20 15:55:00 +00:00
Felipe Pena
8258b703c5 - MFH: Fixed memory leak in wddx_add_vars() 2008-11-20 14:48:41 +00:00
Mark Karpeles
995deb9aef - MFH: #46496, wddx_serialize treats input as ISO-8859-1 (Mark Karpeles) 2008-11-20 14:14:05 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Rob Richards
94fd10cd79 MFH: fix bug #45901 (wddx_serialize_value crash with SimpleXMLElement object)
add test
2008-09-11 14:17:31 +00:00
Felipe Pena
473019a9b5 - MFH: CS 2008-08-24 04:02:49 +00:00
Felipe Pena
55f7368408 - Fixed types
- Fixed protos
2008-07-01 11:26:10 +00:00
Antony Dovgal
2f2953760b fix typo 2008-07-01 07:56:24 +00:00
Felipe Pena
2526420e34 - Added arginfo 2008-06-27 14:33:12 +00:00
Felipe Pena
f23acf749d - New parameter parsing API 2008-06-20 19:57:25 +00:00
Dmitry Stogov
2ecf4bb0a7 Lazy EG(active_symbol_table) initialization 2008-04-29 08:15:20 +00:00
Derick Rethans
f81134a9f2 - MFH: Fixed tests on 64bit platform. 2008-02-25 22:32:59 +00:00
Ilia Alshanetsky
73d031a390 Optimize wddx boolean encoding 2008-01-20 15:33:24 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal
05b536f251 one more fix 2007-10-07 08:33:38 +00:00