php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
101,519 Commits 549 Branches 1,485 Tags
ee06ca8271c17da4b23935aaa2ba8f6cb593d7e2
Commit Graph

44919 Commits

Author SHA1 Message Date
Christoph M. Becker ee06ca8271 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:20:47 +01:00
Christoph M. Becker 7a2497b2c5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73968: Premature failing of XBM reading
 2017-01-21 13:18:54 +01:00
Christoph M. Becker f67d599a01 Fix #73968: Premature failing of XBM reading 
We must take into account the line padding, when we're reading XBM
files.

We deliberately ignore the potential integer overflow here, because
that would be caught by gdImageCreate() or even earlier if `bytes==0`,
what happens in libgd00094.phpt which we adapt accordingly.
 2017-01-21 13:04:36 +01:00
Joe Watkins 1c807377fd Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73961 environmental build dependency in hash sha3 source
 2017-01-21 07:46:52 +00:00
Joe Watkins 1ff27053f9 Fix bug #73961 environmental build dependency in hash sha3 source 2017-01-21 07:45:28 +00:00
Anatol Belski 73bfa264cc Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73962 bug with symlink related to cyrillic directory
 2017-01-20 23:47:12 +01:00
Anatol Belski 95406c878a Fixed bug #73962 bug with symlink related to cyrillic directory 2017-01-20 23:45:08 +01:00
Joe Watkins 0877839469 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:12:30 +00:00
Joe Watkins d6feb2edbd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #73959 - lastInsertId fails to throw an exception in pdsql
 2017-01-20 20:11:49 +00:00
andrewnester 21ac79e94b Fixed #73959 - lastInsertId fails to throw an exception in pdsql 2017-01-20 20:10:55 +00:00
Remi Collet fa45f64bd8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  NEWS
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:50:09 +01:00
Remi Collet 7ea7d3d829 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fixed bug #73965 DTrace reported as enabled when disabled
 2017-01-20 17:46:24 +01:00
Remi Collet f81b7df618 Fixed bug #73965 DTrace reported as enabled when disabled 2017-01-20 17:45:15 +01:00
Dmitry Stogov 1f7bf2bfd6 Optimized extract(). Avoided double hash lookups and repeatable checks through loop splitting. 2017-01-20 10:39:27 +03:00
Joe Watkins 71a42477ca Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update comment, incorrect since 224aaf94
 2017-01-19 10:49:09 +00:00
SjonHortensius 631861e1fa Update comment, incorrect since 224aaf94 
In 224aaf94; the warning was enabled; making the comment above incorrect. I've updated the comment to reflect the current code
 2017-01-19 10:48:54 +00:00
Xinchen Hui 0311dc8697 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:24:04 +08:00
Xinchen Hui 5e09031144 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed another part in ldap (bug #73933)
 2017-01-19 12:23:56 +08:00
Xinchen Hui cad2598fcb Fixed another part in ldap (bug #73933) 2017-01-19 12:23:23 +08:00
Andrey Andreev d89d149edf Disallow non-crypto hashes in HMAC and PBKDF2 
For this purpose add is_crypto flag to php_hash_ops.
 2017-01-18 21:13:54 +01:00
Joe Watkins 5bc81620ef Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:24:49 +00:00
Joe Watkins 6d89640d55 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73949 leak in mysqli_fetch_object
 2017-01-18 18:23:59 +00:00
Joe Watkins f9226f9bf3 Fix bug #73949 leak in mysqli_fetch_object 2017-01-18 18:22:57 +00:00
Joe Watkins f485aca646 Merge branch 'PHP-7.1' 
* PHP-7.1:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
 2017-01-18 17:25:52 +00:00
Joe Watkins bce548d8e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850
 2017-01-18 17:23:29 +00:00
Marcus Bointon 280e9cb28d DNS CAA record type implementation and tests for https://bugs.php.net/bug.php?id=73850 2017-01-18 17:23:08 +00:00
Leigh 2a9ee3c6f6 Merge branch 'PHP-7.1' 2017-01-18 15:04:19 +00:00
Leigh 85589ca660 Add php_openssl_store_errors to bailouts 2017-01-18 15:02:52 +00:00
Leigh 9c5a1c8ae9 Merge branch 'PHP-7.1' 2017-01-18 14:48:36 +00:00
Leigh d2f07edf71 Merge branch 'PHP-7.0' into PHP-7.1 2017-01-18 14:47:49 +00:00
Leigh e7e96fe2e0 Change free to OPENSSL_free 2017-01-18 14:45:41 +00:00
Remi Collet 70ee3fcd1a Merge branch 'PHP-7.1' 
* PHP-7.1:
  NEWS
  NEWS
  Fix #73956 Link use CC instead of CXX
 2017-01-18 13:02:51 +01:00
Remi Collet 2ce8a4cf87 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  NEWS
  Fix #73956 Link use CC instead of CXX
 2017-01-18 13:02:19 +01:00
Remi Collet 6af22d0d3e Fix #73956 Link use CC instead of CXX 2017-01-18 13:00:49 +01:00
Joe Watkins a1fd706d7d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove more TSRMLS_CC macros
 2017-01-18 10:00:26 +00:00
Thomas Punt 9977bdf9b3 Remove more TSRMLS_CC macros 2017-01-18 10:00:15 +00:00
Joe Watkins 7c17936c70 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix ce comparison
 2017-01-18 05:06:59 +00:00
Joe Watkins 43612e9593 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix ce comparison
 2017-01-18 05:06:07 +00:00
Thomas Punt a22f181736 Fix ce comparison 2017-01-18 05:05:53 +00:00
Anatol Belski 7ad94a010d fix changed symbol 2017-01-17 10:10:12 +01:00
Anatol Belski 23db1ce3ba Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:36:42 +01:00
Anatol Belski cea050b8da Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:35:26 +01:00
Anatol Belski 5d07438cb3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #73869: Signed Integer Overflow gd_io.c
  Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
 2017-01-17 09:33:51 +01:00
Christoph M. Becker d2274b01cb Fix #73869: Signed Integer Overflow gd_io.c 
GD2 stores the number of horizontal and vertical chunks as words (i.e. 2
byte unsigned). These values are multiplied and assigned to an int when
reading the image, what can cause integer overflows. We have to avoid
that, and also make sure that either chunk count is actually greater
than zero. If illegal chunk counts are detected, we bail out from
reading the image.

(cherry picked from commit 5b5d9db3988b829e0b121b74bb3947f01c2796a1)
 2017-01-17 09:30:58 +01:00
Christoph M. Becker f1b2afc9d9 Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx() 
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.

(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
 2017-01-17 09:30:43 +01:00
Xinchen Hui fafce65a05 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
 2017-01-17 15:35:46 +08:00
Xinchen Hui e180e45a18 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache)
 2017-01-17 15:35:06 +08:00
Xinchen Hui b28c2e20ca Fixed bug #73933 (error/segfault with ldap_mod_replace and opcache) 2017-01-17 15:34:19 +08:00
Stanislav Malyshev cbc416e8d3 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #73648 - integer overflow in substr
 2017-01-16 12:14:10 -08:00
Stanislav Malyshev 05f2f730e6 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73648 - integer overflow in substr
 2017-01-16 12:14:03 -08:00