Commit Graph

33500 Commits

Author SHA1 Message Date
Xinchen Hui
1dc69e86f9 Fixed memory leak in setlocale 2014-02-25 12:30:50 +08:00
Xinchen Hui
e0a32353af Fixed NULL pointer dereference in ext/standard/tests/strings/setlocale_basic2.php 2014-02-25 12:09:39 +08:00
Xinchen Hui
93428dc6b9 Refactor base64 to returning zend_string 2014-02-24 18:48:22 +08:00
Xinchen Hui
1e5a4f281d Refactor php_uu(en/de)code to returning zend_string 2014-02-24 18:32:09 +08:00
Xinchen Hui
57a3feb422 Fixed memory leak in strrev 2014-02-24 18:15:40 +08:00
Xinchen Hui
5adeaa147d Refactoring php_stream_copy_to_mem to return zend_string 2014-02-24 18:12:30 +08:00
Xinchen Hui
9e9f6c7123 Fixed memory leak in str_pad 2014-02-24 17:44:42 +08:00
Xinchen Hui
b529155635 Fixed memory leak in nlbr 2014-02-24 17:40:18 +08:00
Xinchen Hui
a9529b8ad3 Refactor chunk_split returning zend_string to avoid memleak 2014-02-24 17:35:47 +08:00
Xinchen Hui
479b82c0d4 Fixed invalid write in vsprintf tests 2014-02-24 17:26:09 +08:00
Xinchen Hui
1bb59c73c4 Fixed NULL pointer dereference in ext/standard/tests/strings/strtr_variation* 2014-02-24 16:36:48 +08:00
Xinchen Hui
4fb57d7f4f Fixed wrong size of key length 2014-02-24 16:24:08 +08:00
Xinchen Hui
6c3c1f0949 Fixed memory leak in ext/standard/tests/strings/bug24098.phpt 2014-02-24 16:14:46 +08:00
Xinchen Hui
4dac68221f Fixed NULL pointer dereference in php_url_encode_hash_ex 2014-02-24 16:07:02 +08:00
Xinchen Hui
94e30a8197 Fixed memory leak in substr_replace 2014-02-24 15:58:38 +08:00
Xinchen Hui
948a00ff59 Now we always ZVAL_DUP args[argnum] now (in ed8691b2) 2014-02-24 15:13:06 +08:00
Xinchen Hui
737a84ed04 Revert "Fixed segfault in ext/standard/tests/strings/bug24208.php"
This reverts commit b1fb93b482.
2014-02-24 15:04:05 +08:00
Xinchen Hui
6f6573ef6a Fixed several memory leaks 2014-02-24 15:03:35 +08:00
Xinchen Hui
077b02326a Refactor php_addslashes using zend_string 2014-02-24 12:07:09 +08:00
Xinchen Hui
ed8691b24b Fixed segfault in ext/standard/tests/strings/fprintf_variation_001.php 2014-02-23 22:33:10 +08:00
Xinchen Hui
69a93d2fd7 Fixed segfault in ext/standard/tests/strings/bug49785.phpt 2014-02-23 21:53:48 +08:00
Xinchen Hui
70baf8f419 Fixed the memroy leak first (refactor it later) 2014-02-23 21:43:59 +08:00
Xinchen Hui
b287591a87 Refactor php_str_to_str returning zend_string 2014-02-23 19:25:26 +08:00
Xinchen Hui
bd3bd63571 Fixed wrong zend_string usage in ext/standard/tests/strings/bug47443.php 2014-02-23 19:04:40 +08:00
Xinchen Hui
6a856d4aa9 Fixed inproper IS_REF handling in ext/standard/tests/strings/bug27295.phpt 2014-02-23 18:48:15 +08:00
Xinchen Hui
f21eb59cda Fixed memory leak ext/standard/tests/strings/bug21453.phpt 2014-02-23 18:28:00 +08:00
Xinchen Hui
915a8a2d42 Fixed test ext/standard/tests/strings/bug26817.php 2014-02-23 18:22:53 +08:00
Xinchen Hui
5db2503fc0 Fixed memory leak in ext/standard/tests/strings/bug20927.phpt 2014-02-23 18:17:39 +08:00
Xinchen Hui
c0aba2c641 Refactor basename using zend_string 2014-02-23 18:08:35 +08:00
Xinchen Hui
0e4cfad1e8 Refactor php_addcslashes using zend_string 2014-02-22 20:51:26 +08:00
Xinchen Hui
b1fb93b482 Fixed segfault in ext/standard/tests/strings/bug24208.php
it still ugly,, maybe we should make EG(active_symbol_table) a zend_array?
2014-02-22 20:19:12 +08:00
Xinchen Hui
3cf418c50a No refcounted type 2014-02-22 20:05:04 +08:00
Dmitry Stogov
d149228b69 Use better data structures (incomplete) 2014-02-21 23:51:08 +04:00
Dmitry Stogov
6454684212 Use better data structures (incomplete) 2014-02-21 22:59:51 +04:00
Dmitry Stogov
52bd62eca8 Fixed assertions 2014-02-21 20:35:40 +04:00
Xinchen Hui
013cc55395 Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
2014-02-21 22:41:48 +08:00
Dmitry Stogov
d0eccdeea1 Fixed array_unshift() 2014-02-21 17:38:12 +04:00
Dmitry Stogov
7e03f3712b All zend_parse_parameters("Z") has to be replaced with zend_parse_parameters("z") 2014-02-21 17:22:02 +04:00
Xinchen Hui
8211026fa7 Fixed segfault in ext/standard/tests/strings/add-and-stripslashes.phpt 2014-02-21 16:39:59 +08:00
Xinchen Hui
189a39a187 Fixed segfault 2014-02-19 18:49:00 +08:00
Xinchen Hui
c1c4d26817 Use better data structures (incomplete) 2014-02-19 17:58:39 +08:00
Dmitry Stogov
557994d50d Use better data structures (incomplete) 2014-02-19 01:12:05 +04:00
Dmitry Stogov
246d50fd95 Fixed memory leak 2014-02-18 17:11:57 +04:00
Dmitry Stogov
7428cac6e8 Use better data structures (incomplete) 2014-02-18 16:44:01 +04:00
Dmitry Stogov
9ddf3c5780 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-18 16:28:26 +04:00
Dmitry Stogov
5de7115679 Use better data structures (incomplete; able to run bench.php) 2014-02-18 16:27:38 +04:00
Xinchen Hui
43b03c74b3 Refacting smart_str 2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a Use better data structures (incomplete) 2014-02-17 17:59:18 +04:00
Xinchen Hui
ad1838d248 Use better data structures (incomplete) 2014-02-16 22:27:31 +08:00
Xinchen Hui
f0168baecf Use better data structures (incomplete) 2014-02-16 22:15:54 +08:00
Xinchen Hui
34aefa5604 Use better data structures (incomplete) 2014-02-15 23:21:09 +08:00
Xinchen Hui
6cb316cf5d Use better data structures (incomplete) 2014-02-14 23:11:40 +08:00
Dmitry Stogov
c56a2344d0 Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2 2014-02-14 13:40:23 +04:00
Dmitry Stogov
398256e5fe Use better data structures (incomplete) 2014-02-14 13:40:11 +04:00
Xinchen Hui
068ec75f8b Use better data structures (incomplete) 2014-02-14 17:05:04 +08:00
Dmitry Stogov
40e053e7f3 Use better data structures (incomplete) 2014-02-13 17:54:23 +04:00
Dmitry Stogov
6306918ed2 Use better data structures (incomplete) 2014-02-12 23:54:04 +04:00
Dmitry Stogov
7a9348f45d Reverted zval_clear() and zval_release() back to zval_ptr_dtor() 2014-02-12 22:51:19 +04:00
Xinchen Hui
d3954f16d3 Use better data structures (incomplete) -- stash for today work 2014-02-12 22:15:08 +08:00
Dmitry Stogov
4e66abad54 Use better data structures (incomplete) - refactored return_value handling 2014-02-12 14:29:51 +04:00
Xinchen Hui
0c0efba45f Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2 2014-02-11 19:33:48 +08:00
Xinchen Hui
3f4c877bf7 Use better data structures (incomplete) 2014-02-11 19:33:18 +08:00
Dmitry Stogov
2161103fc3 Use better data structures (incomplete) 2014-02-10 17:49:21 +04:00
Dmitry Stogov
00244baba8 Use better data structures (incomplete) 2014-02-10 12:18:01 +04:00
Dmitry Stogov
f4cfaf36e2 Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
Remi Collet
5b5b9b9239 Merge branch 'PHP-5.6'
* PHP-5.6:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:39 +01:00
Remi Collet
0401226d93 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:29 +01:00
Remi Collet
e3192473b5 Skip readline tests which fail with libedit
Add specific libedit test (output slightly differs)
2014-01-20 09:38:34 +01:00
Remi Collet
3b82a477b0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:41:04 +01:00
Remi Collet
91513097ca Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:40:39 +01:00
Remi Collet
31d67bd353 Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.

Test coverage: readline_clear_history_001.phpt
2014-01-20 08:38:53 +01:00
Yasuo Ohgaki
fd45f1eb78 Merge branch 'PHP-5.6'
* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:33:27 +09:00
Yasuo Ohgaki
fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:32:35 +09:00
Yasuo Ohgaki
4e55c6bffb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:31:50 +09:00
Yasuo Ohgaki
e769c96a11 Enable zend.multibyte tests. Tipcal configuration works, but most tests fail. 2014-01-19 13:29:45 +09:00
Will Fitch
9eb4bc2f84 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:49:06 -05:00
Will Fitch
fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
Will Fitch
98907a96f9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:40:54 -05:00
Will Fitch
da83b513b2 Fix #62479: Some chars not parsed in passwords
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:40 -05:00
Will Fitch
4e5195f82c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66509: copy() arginfo incorrect since 5.4
2014-01-18 11:57:34 -05:00
Will Fitch
a540c57331 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
Will Fitch
767e6d2e08 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb Fix bug #66509: copy() arginfo incorrect since 5.4
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
Anatol Belski
deb56c010e Merge branch 'PHP-5.6' 2014-01-17 11:08:21 +01:00
Anatol Belski
b58dbefba0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
2014-01-17 11:08:02 +01:00
Anatol Belski
7f0aff52cf added appropriate exception handling flag to ext\intl
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
2014-01-17 11:03:40 +01:00
Anatol Belski
feb4eb850d Merge branch 'PHP-5.6'
* PHP-5.6:
  forked the test for bug #66481
2014-01-17 03:32:26 +01:00
Anatol Belski
8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  forked the test for bug #66481
2014-01-17 03:32:06 +01:00
Anatol Belski
14e371e7d4 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  forked the test for bug #66481
2014-01-17 03:31:38 +01:00
Anatol Belski
a218a8b917 forked the test for bug #66481 2014-01-17 03:30:42 +01:00
Xinchen Hui
7691926bbe Merge branch 'PHP-5.6' 2014-01-16 14:42:14 +08:00
Xinchen Hui
bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Xinchen Hui
9799816e0c Merge branch 'PHP-5.4' into PHP-5.5 2014-01-16 14:41:52 +08:00
Xinchen Hui
b777248ded Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null) 2014-01-16 14:41:12 +08:00
Xinchen Hui
271053ad47 Revert "Bug #66481 Segfaults on session_name()"
This reverts commit 5662ffb295.
2014-01-16 14:38:35 +08:00
Yasuo Ohgaki
7b5b2b4efa Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug #66481 Segfaults on session_name()
2014-01-16 11:35:57 +09:00
Yasuo Ohgaki
518327f7e3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Bug #66481 Segfaults on session_name()
2014-01-16 11:35:11 +09:00
Yasuo Ohgaki
744f38c2d6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Bug #66481 Segfaults on session_name()
2014-01-16 11:34:31 +09:00
Conor McDermottroe
5662ffb295 Bug #66481 Segfaults on session_name()
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.

This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
2014-01-16 11:33:10 +09:00
Dmitry Stogov
511a375e60 Merge branch 'PHP-5.6'
* PHP-5.6:
  Log information about cached scripts and keys
2014-01-15 12:15:41 +04:00