Permalink
Browse files

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75055 Out-Of-Bounds Read in timelib_meridian()
  Apply upstream patch for CVE-2016-1283
  • Loading branch information...
weltling authored and krakjoe committed Oct 24, 2017
1 parent 5c81d85 commit 5c0455bf2c8cd3c25401407f158e820aa3b239e1
Showing with 1,066 additions and 925 deletions.
  1. +1,030 −922 ext/date/lib/parse_date.c
  2. +2 −2 ext/date/lib/parse_date.re
  3. +1 −1 ext/date/tests/bug53437_var3.phpt
  4. +20 −0 ext/wddx/tests/bug75055.phpt
  5. +13 −0 ext/wddx/tests/bug75055.wddx
Oops, something went wrong.

0 comments on commit 5c0455b

Please sign in to comment.