php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 19:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
115,813 Commits 547 Branches 1,481 Tags
375ceefec00df23c71bbc164e272ff41f68c91bc
Commit Graph

514 Commits

Author SHA1 Message Date
Stanislav Malyshev
e043025fda Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:20:59 -07:00
Stanislav Malyshev
4adf3dc109 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:20:52 -07:00
Stanislav Malyshev
d69894734d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:20:44 -07:00
Stanislav Malyshev
284fb08fdc Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
 2019-07-29 13:19:16 -07:00
Christoph M. Becker
cd1101e8c8 Fix #77919: Potential UAF in Phar RSHUTDOWN 
We have to properly clean up in case phar_flush() is failing.

We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
 2019-07-29 13:18:27 -07:00
Nikita Popov
a1e2c8870e Merge branch 'PHP-7.4' 2019-07-22 17:26:01 +02:00
Nikita Popov
d59aac58b3 Report errors from stream read and write operations 
The php_stream_read() and php_stream_write() functions now return
an ssize_t value, with negative results indicating failure. Functions
like fread() and fwrite() will return false in that case.

As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams
should not be regarded as error conditions, and be reported as
successful zero-length reads/writes instead. The handling of EINTR
remains unclear and is internally inconsistent (e.g. some code-paths
will automatically retry on EINTR, while some won't).

I'm landing this now to make sure the stream wrapper ops API changes
make it into 7.4 -- however, if the user-facing changes turn out to
be problematic we have the option of clamping negative returns to
zero in php_stream_read() and php_stream_write() to restore the
old behavior in a relatively non-intrusive manner.
 2019-07-22 17:17:28 +02:00
Peter Kokot
7d94c90374 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix failed tests for phar
 2019-07-21 00:50:27 +02:00
Peter Kokot
b1643e166d Fix failed tests for phar 
- when $status is boolean, E_NOTICE appears and tests fail
- opcache is never enabled on these tests anyway.
- Add opcache.revalidate_freq=0 to testing script

  Instead of checking this in the tests files it can be used directly in
  the main testing script. Also this fixes failed tests.

- Use opcache_invalidate() instead of sleep() delay in some tests. Some
  delays are still used since the opcache_invalidate seems to be buggy
  and not working as expected.

Closes GH-4392
 2019-07-21 00:49:35 +02:00
Nikita Popov
1cdc0d9056 Merge branch 'PHP-7.4' 2019-07-10 12:55:52 +02:00
Nikita Popov
07bbc54658 Fix file collisions in phar tests 2019-07-10 12:55:40 +02:00
Peter Kokot
8569a6740e Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix phar tests with hash extension
  Fix missing file and remove SKIP section
 2019-06-30 23:52:30 +02:00
Peter Kokot
839ff378bc Fix phar tests with hash extension 
- The hash extension is now always available.

- Remove unfinished test
  The Phar::PGP currently doesn't exist yet.
 2019-06-30 23:51:56 +02:00
Peter Kokot
221494f4de Merge branch 'PHP-7.4' 
* PHP-7.4:
  Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols
 2019-06-27 23:29:11 +02:00
Peter Kokot
033cafacbd Sync HAVE_HASH, HAVE_HASH_EXT, PHAR_HASH_OK symbols 
The hash extension is always available since PHP-7.4. The symbol
HAVE_HASH_EXT is kept for BC reasons and removed in PHP-8.0.

This patch also removes the PHAR_HASH_OK since it is no longer
relevant.
 2019-06-27 23:25:33 +02:00
Joe Watkins
96cfcd407e Merge branch 'PHP-7.4' 
* PHP-7.4:
  this mtime comparison makes assumptions that cannot always hold true
 2019-06-16 08:29:41 +02:00
Joe Watkins
2283884475 this mtime comparison makes assumptions that cannot always hold true 2019-06-16 08:29:04 +02:00
Christoph M. Becker
9922000dd1 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Prevent test conflicts
 2019-05-14 10:12:11 +02:00
Christoph M. Becker
15b394cce9 Prevent test conflicts 2019-05-14 10:11:29 +02:00
Christoph M. Becker
263b0cf71b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix tests for non English environments
 2019-04-17 09:58:40 +02:00
Christoph M. Becker
346ac968b3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix tests for non English environments
 2019-04-17 09:58:12 +02:00
Christoph M. Becker
ec8457d982 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix tests for non English environments
 2019-04-17 09:57:37 +02:00
Christoph M. Becker
6fe75f9e45 Fix tests for non English environments 2019-04-17 09:56:55 +02:00
Anatol Belski
30f5822a9b Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix phar:// include handling with file cache
 2019-04-10 14:57:27 +02:00
Anatol Belski
db7aba538d Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix phar:// include handling with file cache
 2019-04-10 14:57:04 +02:00
Anatol Belski
1aa30bb71c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix phar:// include handling with file cache
 2019-04-10 14:56:29 +02:00
Anatol Belski
f31d7ca85e Fix phar:// include handling with file cache 2019-04-10 14:55:15 +02:00
Peter Kokot
6426420f61 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Replace dirname(__FILE__) by __DIR__ in tests
 2019-03-15 23:36:47 +01:00
Fabien Villepinte
26dfce7f36 Replace dirname(__FILE__) by __DIR__ in tests 2019-03-15 22:55:30 +01:00
Nikita Popov
852485d8ec Adjust tests for zpp TypeError change 2019-03-11 11:32:20 +01:00
Nikita Popov
19e4abd7ec Merge branch 'PHP-7.4' 2019-03-07 15:55:13 +01:00
Nikita Popov
c8e10c6119 More zpp error/variation test removals 2019-03-07 15:54:31 +01:00
Anatol Belski
4a7a79b37a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix test portability
 2019-03-04 14:30:55 +01:00
Anatol Belski
53c44a43dd Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix test portability
 2019-03-04 14:30:32 +01:00
Anatol Belski
a976283c34 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test portability
 2019-03-04 14:30:01 +01:00
Anatol Belski
040196972c Fix test portability 2019-03-04 14:28:47 +01:00
Stanislav Malyshev
d2a8904146 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 23:34:00 -08:00
Stanislav Malyshev
ad4f312d2f Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename 2019-03-03 23:34:00 -08:00
Stanislav Malyshev
071e18c697 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
 2019-03-03 23:33:54 -08:00
Stanislav Malyshev
6d60ed69a1 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
 2019-03-03 23:33:48 -08:00
Stanislav Malyshev
3e8d8f7fb3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow
 2019-03-03 23:33:43 -08:00
Stanislav Malyshev
e0f5d62bd6 Fix bug #77586 - phar_tar_writeheaders_int() buffer overflow 2019-03-03 23:05:32 -08:00
Stanislav Malyshev
534a18c08f Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:49 -08:00
Stanislav Malyshev
e3f7c352dc Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:42 -08:00
Stanislav Malyshev
8363df3703 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fix test error message
  Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE
  Fix bug #77540 - Invalid Read on exif_process_SOFn
  Fix integer overflows on 32-bits
  Fix #77431 SplFileInfo::__construct() accepts NUL bytes
  Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename
 2019-03-03 22:20:35 -08:00
Stanislav Malyshev
7f0ab7c20c Fix bug #77396 - Null Pointer Dereference in phar_create_or_parse_filename 2019-03-03 18:22:32 -08:00
Nikita Popov
93ee216966 Merge branch 'PHP-7.4' 2019-02-22 11:26:26 +01:00
Nikita Popov
e2cc0b823c Fix more file name collisions in phar tests 2019-02-22 11:25:52 +01:00
Nikita Popov
3b5e566e62 Merge branch 'PHP-7.4' 2019-02-22 10:53:28 +01:00
Nikita Popov
d3e00decd4 Use separate files in phar tests 2019-02-22 10:50:56 +01:00