clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 13:56:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,130 Commits 494 Branches 1,367 Tags 788 MiB
774b113b32
Commit Graph

89130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lior Kaplan
df340b5d8e Add CVE to bug #69248 2015-03-19 02:37:50 +02:00
Lior Kaplan
61d11d7e10 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Align entries format
  Add CVE to bug #69248
  Add CVE assigned to 5.5.22 bugs after the release
 2015-03-19 02:36:28 +02:00
Lior Kaplan
6a4399a8d9 Align entries format 2015-03-19 02:35:20 +02:00
Lior Kaplan
3eba942eb2 Add CVE to bug #69248 2015-03-19 02:30:31 +02:00
Lior Kaplan
4680f08607 Add CVE assigned to 5.5.22 bugs after the release 2015-03-19 02:29:43 +02:00
Anthony Ferrara
78d2399493 Fix C89 compatibility by moving a misplaced if statement 2015-03-18 18:38:16 -04:00
Anthony Ferrara
d8ef608f3d Refactor gotos into more elaborate ifs to eliminate goto failure 2015-03-18 18:24:00 -04:00
Anthony Ferrara
427ecdc5eb Fix return type separation with references. It now includes a check in the opcode handler and properly separates the value in both cases 2015-03-18 18:10:08 -04:00
Bob Weinand
dac2b060e4 Remove bogus ZEND_ASSERT(hash != 0) 
There's always a possibility that the has will end up as equal to zero due to overflowing.
See the tests for strings whose hash overflow.
Yes, there's a check for whether the hash already was calculated... and strings with a hash equal to zero always need the hash recalculated, in one of 2^32 respectively 2^64 cases - which should not be a major issue.
 2015-03-18 22:25:55 +01:00
Anthony Ferrara
f040538448 Add error case with invalid type declaration default value 2015-03-18 16:53:45 -04:00
Anthony Ferrara
94fe6c42fa Add tests for using constants as defaults with scalar type declarations 2015-03-18 16:50:51 -04:00
Anthony Ferrara
724f7118f1 Refactor error messages to only append defined in the event of rendering as a fatal error. Fix relative typehints to not work 2015-03-18 16:38:51 -04:00
Anthony Ferrara
1df033c5cd Revert gd and mysqli to former calls for arg count errors. Fix first identified issues with zend_compile.c from nikic. Add tests for generator returns prior to first yield 2015-03-18 16:14:02 -04:00
Anatol Belski
eb5dfedb6b don't expect set/get title symbols are always there 2015-03-18 20:50:54 +01:00
Anthony Ferrara
579e7fa457 Style cleanup, as well as fixing bug with missing argument for WRONG_PARAM_COUNT_WITH_RETVAL 2015-03-18 15:45:16 -04:00
Anthony Ferrara
8be4266f6a Clean up API renames for zend_wrong_param_count to maintain BC, introducing a zend_wrong_param_count_ex() function when you know strict value 2015-03-18 15:42:49 -04:00
Anthony Ferrara
0529eeb4a6 Fix executor issue with ignoring strict types, which cleans up a bunch of errors. Additionally fix the expected error of 2 unrelated tests that was caused by a change to the core error messages 2015-03-18 15:22:21 -04:00
Anthony Ferrara
dd9f4f9585 Fix more tests, improve error messages in failure output for thrown exception 2015-03-18 12:42:09 -04:00
Anthony Ferrara
7feebead1b Refactor error implementation significantly to centralize error mode behavior. Add zend_internal_type_error() function 2015-03-18 12:23:09 -04:00
Anthony Ferrara
d22bfb8aa6 Merge in master, fix merge conflicts and update patch to support exceptions everywhere 2015-03-18 10:50:11 -04:00
Dmitry Stogov
d092cb6e8e Second prefetch is useless, because cahce line on modern x86 CPUs is 64 bytes long. 2015-03-18 17:11:21 +03:00
Xinchen Hui
5c6db3b0f2 Better make this be consistent with DO_ICALL/DO_CALL 
Revert "Use more specific op type"
This reverts commit 9b07ed6dcc.
 2015-03-18 22:09:57 +08:00
Anatol Belski
e839ed8c99 strtod shouldn't recognize hex strings 2015-03-18 14:26:15 +01:00
Dmitry Stogov
a01b5f2953 Enabled global register variables for PPC 2015-03-18 16:15:00 +03:00
Xinchen Hui
9b07ed6dcc Use more specific op type 2015-03-18 20:56:28 +08:00
Dmitry Stogov
4e11095438 Reimplemented special constant handling. Now __HALT_COMPILER_OFFSET__ is resolved at compile-time. __CLASS__ retrived using separate ZEND_FETCH_CLASS_NAME opcode. 2015-03-18 15:33:56 +03:00
Dmitry Stogov
65b7f4860e Revert "Improved zend_get_special_constant" 
This reverts commit 624eb49e78.
 2015-03-18 15:25:27 +03:00
Julien Pauli
a3b5061cb8 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-03-18 11:35:04 +01:00
Julien Pauli
c7dfd8a3a4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-03-18 11:34:56 +01:00
Julien Pauli
9744aded1a Updated NEWS 2015-03-18 11:34:45 +01:00
Julien Pauli
4794f6bcc4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS
 2015-03-18 10:56:03 +01:00
Julien Pauli
6262db7341 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
 2015-03-18 10:55:49 +01:00
Julien Pauli
5e4dd962e2 Updated NEWS 2015-03-18 10:55:32 +01:00
Stanislav Malyshev
ff1914f491 Merge branch 'PHP-5.6' 
* PHP-5.6:
  5.4.40 next
 2015-03-17 22:39:28 -07:00
Stanislav Malyshev
58efcc7dd8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.40 next
 2015-03-17 22:39:21 -07:00
Stanislav Malyshev
de0cee2f39 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.40 next

Conflicts:
	configure.in
	main/php_version.h
 2015-03-17 22:39:10 -07:00
Stanislav Malyshev
4c3b73b6df 5.4.40 next 2015-03-17 22:37:16 -07:00
Stanislav Malyshev
1ecd82f588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
	ext/ereg/regex/regcomp.c
	ext/standard/basic_functions.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	win32/registry.c
 2015-03-17 22:04:39 -07:00
Stanislav Malyshev
225cb973e5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
	ext/zip/lib/zip_dirent.c
 2015-03-17 22:03:24 -07:00
Stanislav Malyshev
210cfafc2b update NEWS 2015-03-17 22:00:53 -07:00
Stanislav Malyshev
53eff4a369 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
 2015-03-17 22:00:29 -07:00
Stanislav Malyshev
ef8fc4b53d Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary 2015-03-17 21:59:56 -07:00
Xinchen Hui
205fe3ab89 Re-fix tests 2015-03-18 12:28:27 +08:00
Xinchen Hui
22b8b1d3f3 Revert "fix tests" 
This reverts commit 38e15d89d7.
 2015-03-18 12:27:13 +08:00
Xinchen Hui
e78278d878 Revert "Fixed tests" 
This reverts commit f57f1a903d.
 2015-03-18 12:26:56 +08:00
Xinchen Hui
624eb49e78 Improved zend_get_special_constant 2015-03-18 12:22:07 +08:00
Xinchen Hui
f57f1a903d Fixed tests 2015-03-18 12:19:56 +08:00
Stanislav Malyshev
d76b293ac7 forgot to commit this one 2015-03-17 17:16:27 -07:00
Stanislav Malyshev
63c9f830b1 add test for bug #68976 2015-03-17 17:16:15 -07:00
Stanislav Malyshev
749f82af02 oops, no idea how this got in 2015-03-17 17:13:50 -07:00