Commit Graph

85703 Commits

Author SHA1 Message Date
Anatol Belski
e4464a8e85 convert API for size_t where zend_string is used under the hood 2014-10-28 17:24:59 +01:00
Anatol Belski
36b64b44d5 fix signature, zend_string is used for function name 2014-10-28 17:24:58 +01:00
Anatol Belski
e7945419dd fix datatype mismatches 2014-10-28 17:24:56 +01:00
Anatol Belski
1770ae641b fix datatype mismatches 2014-10-28 17:24:55 +01:00
Anatol Belski
77ab77fd02 fix datatype mismatch 2014-10-28 17:24:54 +01:00
Anatol Belski
e048426402 fix datatype mismatch 2014-10-28 17:24:53 +01:00
Anatol Belski
5ac84a5a47 fix datatype mismatch warns 2014-10-28 17:24:51 +01:00
Anatol Belski
99d12cf202 fix datatype mismatch 2014-10-28 17:24:50 +01:00
Xinchen Hui
5190d8fb56 Addtion fix for bug #68252 , forget static variable hanlding 2014-10-28 17:42:06 +08:00
Xinchen Hui
e6fe3127d0 Fixed bug #68252 (segfault in Zend/zend_hash.c in function _zend_hash_del_el)
Don't leave a UNDEF gap in function_table
2014-10-28 17:36:03 +08:00
Remi Collet
2bec5d18b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Ensure we have enough input data before parsing date
2014-10-28 08:51:22 +01:00
Remi Collet
47acdcb176 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Ensure we have enough input data before parsing date
2014-10-28 08:50:48 +01:00
Remi Collet
13a218d328 Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
2014-10-28 08:48:22 +01:00
Stanislav Malyshev
6457c34ad8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #68095 - invalid read in php_getopt()
2014-10-27 19:10:43 -07:00
Stanislav Malyshev
c5659cb8bd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #68095 - invalid read in php_getopt()
2014-10-27 19:09:39 -07:00
Stanislav Malyshev
deadeeae1d Fix bug #68095 - invalid read in php_getopt()
It's a hacky solution and incomplete, but I don't see other way
without refactoring the whole getopt protocol.
2014-10-27 19:06:44 -07:00
Anatol Belski
0f5858e3a3 fix datatype mismatch 2014-10-27 17:31:38 +01:00
Anatol Belski
9858df2f80 fix datatype mismatch warnings 2014-10-27 17:28:01 +01:00
Anatol Belski
fa1e8f70f4 fix datatype mismatch 2014-10-27 17:20:24 +01:00
Anatol Belski
201f47e5db fix datatype mismatch 2014-10-27 17:16:24 +01:00
Anatol Belski
deaeca4000 fix datatype mismatches 2014-10-27 17:15:26 +01:00
Anatol Belski
390182d8e6 fix datatype mismatch warning 2014-10-27 17:04:44 +01:00
Anatol Belski
868dbf609b fix datatype mismatches 2014-10-27 17:02:52 +01:00
Anatol Belski
52bd403d0b fix datatype mismatches 2014-10-27 16:38:53 +01:00
Anatol Belski
37634c9a67 fix datatype mismatch 2014-10-27 16:38:52 +01:00
Anatol Belski
d8ed655351 fix datatype mismatch warns 2014-10-27 16:38:51 +01:00
Anatol Belski
05f812c8d3 catch up with zend_html_puts 2014-10-27 16:38:49 +01:00
Anatol Belski
e99040659e fix datatype mismatches and warns 2014-10-27 16:38:48 +01:00
Anatol Belski
11b119d526 fix datatype mismatches 2014-10-27 16:38:47 +01:00
Anatol Belski
82c36cf5e8 fix datatype mismatches 2014-10-27 16:38:46 +01:00
Anatol Belski
73ecac89e1 fix datatype mismatches and warnings 2014-10-27 16:38:45 +01:00
Anatol Belski
b983929652 fix datatype mismatch warnings 2014-10-27 16:38:44 +01:00
Anatol Belski
ae06555003 fix datatype mismatch warnings 2014-10-27 16:38:42 +01:00
Anatol Belski
ac964fbe30 fix datatype mismatches 2014-10-27 16:38:41 +01:00
Anatol Belski
b0d86d87d8 fix datatype mismatches 2014-10-27 16:38:40 +01:00
Anatol Belski
5b5e2d3d45 fix datatype mismatch warnings 2014-10-27 16:38:39 +01:00
Anatol Belski
8fdaeef8e8 fix datatype mismatches 2014-10-27 16:38:38 +01:00
Bob Weinand
baba4254ce Merge remote-tracking branch 'origin/PHP-5.6'
Conflicts:
	sapi/phpdbg/phpdbg_bp.c
2014-10-27 14:32:58 +01:00
Bob Weinand
0ede82d466 Merge phpdbg into PHP-5.6 2014-10-27 14:07:26 +01:00
Bob Weinand
2297a9aa01 Fix resolving breakpoints of already loaded files 2014-10-27 13:55:20 +01:00
Bob Weinand
8b98ffea5f Never exist xml mode... 2014-10-27 13:27:54 +01:00
Bob Weinand
a3ae401524 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-27 13:19:33 +01:00
Bob Weinand
6eab2b9101 Merge phpdbg into PHP-5.6
Conflicts:
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_prompt.c
2014-10-27 13:11:13 +01:00
Bob Weinand
b4db856d37 Fix failing quit when quitting during execution 2014-10-27 11:02:08 +01:00
Bob Weinand
9139d031d8 Fix segfault when cleaning without execution context 2014-10-27 11:01:43 +01:00
Bob Weinand
5e8359d360 Fix listening on port 2014-10-27 10:49:16 +01:00
Anatol Belski
08684a9828 Merge branch 'master' of github.com:krakjoe/phpdbg
Conflicts:
	phpdbg_prompt.c
2014-10-27 10:19:59 +01:00
Anatol Belski
0e7987c61a improve the current sigio handling on win32 2014-10-27 10:08:58 +01:00
Remi Collet
2233625e02 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #63595 GMP memory management conflicts with other libraries using GMP

Conflicts:
	ext/gmp/gmp.c
2014-10-27 07:53:54 +01:00
Remi Collet
cc91072f0e NEWS 2014-10-27 07:51:50 +01:00