php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 08:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
88,418 Commits 549 Branches 1,485 Tags
ec00a4de4e8db83c07afde9a182d43fe73d860c9
Commit Graph

266 Commits

Author SHA1 Message Date
Dmitry Stogov 4241a090ad Avoid reallocation in preg_replace() if nothing was replaced 2015-02-10 13:30:25 +03:00
Anatol Belski f9d672f7d4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  simplify error handling for dirs as magic
 2015-01-22 10:17:45 +01:00
Anatol Belski 60c2621b2a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  simplify error handling for dirs as magic
 2015-01-22 10:17:14 +01:00
Anatol Belski 43652d386a simplify error handling for dirs as magic 2015-01-22 10:16:13 +01:00
Anatol Belski 4e3e95dfc0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #68827 Double free with disabled ZMM
 2015-01-22 10:02:05 +01:00
Anatol Belski d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
 2015-01-22 10:00:10 +01:00
Joshua Rogers 91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski 723319813b Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:25:28 +01:00
Anatol Belski 28e44f9d44 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:23:56 +01:00
Anatol Belski 5fe54dbaf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:22:37 +01:00
Anatol Belski ede59c8feb Fixed bug #68735 fileinfo out-of-bounds memory access 2015-01-04 14:20:21 +01:00
Anatol Belski c06f66563a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  removed dead code

Conflicts:
	ext/fileinfo/libmagic/readelf.c
	ext/fileinfo/libmagic/readelf.h
 2015-01-04 09:42:46 +01:00
Anatol Belski b644dcfb72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed dead code
 2015-01-04 09:40:56 +01:00
Remi Collet 919abf0cb1 removed dead code 2015-01-04 09:40:19 +01:00
Anatol Belski a78eaddbe0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #68671 incorrect expression in libmagic

Conflicts:
	ext/fileinfo/libmagic/print.c
 2014-12-30 19:41:07 +01:00
Anatol Belski 091ea62262 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68671 incorrect expression in libmagic
 2014-12-30 19:38:08 +01:00
Anatol Belski d92a87d7cb Fixed bug #68671 incorrect expression in libmagic 2014-12-30 19:37:27 +01:00
Anatol Belski ef89ab2f99 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWs
  Fixed bug #68665 (Invalid free)
 2014-12-28 14:02:25 +01:00
Anatol Belski a72cd07f29 Fixed bug #68665 (Invalid free) 2014-12-28 13:58:01 +01:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Remi Collet f0f51da936 drop dead/unused code 2014-12-09 11:25:53 +01:00
Veres Lajos 06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Remi Collet 1fbc93512f Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
 2014-10-25 11:31:54 +02:00
Remi Collet cefa310cf9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
 2014-10-25 11:30:29 +02:00
Remi Collet 5b295bf191 Fix bug #68283: fileinfo: out-of-bounds read in elf note headers 
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0

CVE -2014-3710

(cherry picked from commit 1803228597)
 2014-10-25 11:29:16 +02:00
Remi Collet 1803228597 Fix bug #68283: fileinfo: out-of-bounds read in elf note headers 
Upstream commit
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0

CVE -2014-3710
 2014-10-22 15:37:04 +02:00
Remi Collet d8686473c2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
 2014-10-22 15:27:54 +02:00
Remi Collet ef2a2fa3a1 Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer 
Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213
 2014-10-22 15:24:59 +02:00
Ard Biesheuvel 90fcf0f52a Merge branch 'PHP-5.6' 2014-09-20 16:42:31 -07:00
Ard Biesheuvel 8312836c74 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-20 16:42:12 -07:00
Ard Biesheuvel 7958793342 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-20 16:40:02 -07:00
Ard Biesheuvel e64da8c20d Fixed bug #66242 (don't assume char is signed) 
This fixes a bug in libmagic where a cast to 'char' is assumed to result
in sign extension to occur. However, unqualified 'char' is unsigned on
architectures such as ARM, so the cast needs to be to 'signed char'
explicitly.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
 2014-09-20 16:39:48 -07:00
Dmitry Stogov 3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Anatol Belski f4ebeead5d Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67731 finfo::file() returns invalid mime type for binary files
 2014-08-30 04:05:42 +02:00
Anatol Belski c301467f9b Fixed bug #67731 finfo::file() returns invalid mime type for binary files 2014-08-30 04:04:42 +02:00
Anatol Belski bf96ee95ce 's' works with size_t round 4 2014-08-27 20:49:37 +02:00
Anatol Belski 6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Anatol Belski af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski 4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski ac6d6aebd8 ported ext/fileinfo 2014-08-19 21:35:13 +02:00
Anatol Belski 63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov 8b66d64b23 Merge branch 'master' into phpng 
* master:
  add NEWS for 5.6 too
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
  fix test
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
  Add NEWS entry for log() improvements
 2014-08-15 08:10:08 +04:00
Stanislav Malyshev 23122ba69c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:22:06 -07:00
Stanislav Malyshev 3468f03b6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
 2014-08-14 17:21:29 -07:00
Remi Collet 35f32637b0 Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:21:20 -07:00
Remi Collet 49387b31cf Fix bug #67716 - Segfault in cdf.c 2014-08-14 17:19:03 -07:00