archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
128150 commits 526 branches 1434 tags 867 MiB
Commit graph

588 commits

Author SHA1 Message Date
Nikita Popov
727929765b Merge branch 'PHP-7.2' into PHP-7.3 2019-07-29 11:26:09 +02:00
Nikita Popov
d142dfc93d Fixed bug #78333 
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
 2019-07-29 11:25:27 +02:00
Stanislav Malyshev
aeb6d13185 Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment) 2019-07-29 00:53:37 -07:00
Stanislav Malyshev
dea2989ab8 Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail) 2019-07-29 00:53:28 -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
Stanislav Malyshev
27b6d36f98 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Simplify expression and remove the possibility of div by 0
 2019-07-07 16:21:06 -07:00
Stanislav Malyshev
57e7c3aac1 Simplify expression and remove the possibility of div by 0 
Maybe should use exp2() but not sure about how supported it is.
 2019-07-07 16:16:05 -07:00
Nikita Popov
3645292235 Merge branch 'PHP-7.4' 2019-06-19 15:09:39 +02:00
Nikita Popov
1c018af682 Fix shift UB in php_ifd_get32s 2019-06-19 15:09:00 +02:00
twosee
63171d88f2 Add do...while(0) for RETURN_* and ZVAL_* APIs 
Closes GH-4255.
 2019-06-12 16:17:16 +02:00
Nikita Popov
7686b0b889 Merge branch 'PHP-7.4' 2019-06-05 14:53:50 +02:00
Nikita Popov
a31f46421d Allow exceptions in __toString() 
RFC: https://wiki.php.net/rfc/tostring_exceptions

And convert some object to string conversion related recoverable
fatal errors into Error exceptions.

Improve exception safety of internal code performing string
conversions.
 2019-06-05 14:25:07 +02:00
Stanislav Malyshev
d99de36e53 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:34 -07:00
Stanislav Malyshev
670c2ee685 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:29 -07:00
Stanislav Malyshev
13dffa9d32 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be Fix bug #77988 - heap-buffer-overflow on php_jpg_get16 2019-05-27 17:28:09 -07:00
Stanislav Malyshev
bc8822361a Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
 2019-04-30 00:06:15 -07:00
Stanislav Malyshev
db0de953ba Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
 2019-04-30 00:06:10 -07:00
Stanislav Malyshev
66b32f25d5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
 2019-04-30 00:05:43 -07:00
Stanislav Malyshev
cb5af4e8a0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
 2019-04-30 00:05:32 -07:00
Stanislav Malyshev
f80ad18afa Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG 
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
 2019-04-30 00:05:23 -07:00
Dmitry Stogov
e188e4170f Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference 2019-04-24 18:28:29 +03:00
Dmitry Stogov
2e4686b566 Use ZEND_TRY_ASSIGN_REF_... macros for arguments passed to internal function by reference 2019-04-24 18:16:47 +03:00
Dmitry Stogov
34db07567d Use ZEND_TRA_ASSIGN_REF_... macros for by reference arguments of internal functions. 2019-04-24 16:14:48 +03:00
Kalle Sommer Nielsen
eb8a19c8ad Merge branch 'PHP-7.4' 
* PHP-7.4:
  Remove dead JPEG2000 code
 2019-04-02 21:18:48 +03:00
Kalle Sommer Nielsen
dce7f244a9 Remove dead JPEG2000 code 2019-04-02 21:18:06 +03:00
Remi Collet
2b41d1fb0c Merge branch 'PHP-7.4' 
* PHP-7.4:
  fix paste issue
 2019-04-02 11:06:22 +02:00
Remi Collet
8354c28cc5 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix paste issue
 2019-04-02 11:06:06 +02:00
Remi Collet
002983e463 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix paste issue
 2019-04-02 11:05:54 +02:00
Remi Collet
f7755163b7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  fix paste issue
 2019-04-02 11:05:39 +02:00
Remi Collet
dc1cd3daf2 fix paste issue 2019-04-02 11:05:09 +02:00
Christoph M. Becker
eb7a7e4b53 Merge branch 'PHP-7.4' 
* PHP-7.4:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:43:23 +02:00
Christoph M. Becker
efb4597ecc Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:42:35 +02:00
Christoph M. Becker
b8fdaa7c42 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:41:26 +02:00
Christoph M. Becker
f6efe70505 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Pointer arithmetic on void pointers is illegal
 2019-04-02 10:40:56 +02:00
Christoph M. Becker
01a4de5c58 Pointer arithmetic on void pointers is illegal 
We quick-fix this by casting to char*; it might be more appropriate to
use char pointers in the first place.
 2019-04-02 10:39:44 +02:00
Stanislav Malyshev
bef66e1b6f Merge branch 'PHP-7.4' 
* PHP-7.4:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:13:11 -07:00
Stanislav Malyshev
c0af0ae5a4 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:13:06 -07:00
Stanislav Malyshev
da5fbb8c36 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:13:00 -07:00
Stanislav Malyshev
c83af86f8b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
 2019-04-02 00:12:54 -07:00
Stanislav Malyshev
887a7b5714 Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF 2019-04-02 00:12:26 -07:00
Stanislav Malyshev
a1631ac57b Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s 2019-03-31 23:11:34 -07:00
Stanislav Malyshev
f45e7861ef Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
 2019-03-31 23:10:04 -07:00
Stanislav Malyshev
9efaac30ae Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
 2019-03-31 23:09:57 -07:00
Stanislav Malyshev
f3ab302270 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
 2019-03-31 23:09:18 -07:00
Stanislav Malyshev
f3aefc6d07 Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s 2019-03-31 23:09:06 -07:00
Stanislav Malyshev
b82437eedd Fix bug #77563 - Uninitialized read in exif_process_IFD_in_MAKERNOTE 
Also fix for bug #77659
 2019-03-03 23:34:00 -08:00
Stanislav Malyshev
30d2b94a2e Fix bug #77540 - Invalid Read on exif_process_SOFn 2019-03-03 23:34:00 -08:00