php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
115,082 Commits 549 Branches 1,484 Tags
e8a89c49db303dfdbee4d5e64a0086f22015c1d2
Commit Graph

2014 Commits

Author SHA1 Message Date
Christoph M. Becker 5dd1877ca1 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix potential integer overflow detected by oss-fuzz
 2020-08-24 17:36:50 +02:00
Christoph M. Becker 74de17f2ea Fix potential integer overflow detected by oss-fuzz 
We port the respective fix from upstream[1].

[1] <https://github.com/libgd/libgd/commit/9ed642764cf0b4585d135eb738812a43265cb2d3>
 2020-08-24 17:35:04 +02:00
Christoph M. Becker ff7fd3dc85 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79676: imagescale adds black border with IMG_BICUBIC
 2020-06-12 14:07:43 +02:00
Christoph M. Becker 86e1f0ea11 Fix #79676: imagescale adds black border with IMG_BICUBIC 
We have to loop over all image pixels to avoid the black border.  This
is also done in external libgd in `_gdScaleOneAxis` and `_gdScalePass`.
 2020-06-12 14:05:54 +02:00
Christoph M. Becker da801ba5e3 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79615: Wrong GIF header written in GD GIFEncode
 2020-05-22 09:19:05 +02:00
Christoph M. Becker d4bd6fb491 Fix #79615: Wrong GIF header written in GD GIFEncode 
The color resolution is expected in bits 4-6 of the packed fields byte
of the logical screen descriptor (byte 10 of the GIF data stream),
according to the specification[1], section 18.

[1] <https://www.w3.org/Graphics/GIF/spec-gif89a.txt>
 2020-05-22 09:15:41 +02:00
Christoph M. Becker 74b11e3315 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79068: gdTransformAffineCopy() changes interpolation method
 2020-01-06 10:38:22 +01:00
Christoph M. Becker 4bec59f175 Fix #79068: gdTransformAffineCopy() changes interpolation method 
We port
<https://github.com/libgd/libgd/commit/9088591eae437358ee5b929adf82865e37e3001e>.
 2020-01-06 10:36:48 +01:00
Christoph M. Becker f799f42ec8 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #79067: gdTransformAffineCopy() may use unitialized values
 2020-01-06 09:37:40 +01:00
Christoph M. Becker 2c5860517c Fix #79067: gdTransformAffineCopy() may use unitialized values 
We port
<https://github.com/libgd/libgd/commit/7a06c1669c563917bc48c464521e3de962ddb4e8>.
 2020-01-06 09:35:13 +01:00
Dmitry Stogov 92c23e1fd3 Call zend_unregister_ini_entries() when unload extension loaded through dl() without MSHUTDOWN callback. 
Extensions with MSHUTDOWN should use UNREGISTER_INI_ENTRIES().
 2019-12-09 15:05:24 +03:00
Christoph M. Becker aba070e630 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78923: Artifacts when convoluting image with transparency
 2019-12-07 12:08:30 +01:00
willson-chen b5d2cbe027 Fix #78923: Artifacts when convoluting image with transparency 
We have to properly initialize `pxl` before using it.

Fix ported from <https://github.com/libgd/libgd/pull/559>.
 2019-12-07 12:06:33 +01:00
Christoph M. Becker b78ec58f09 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
 2019-11-21 10:02:33 +01:00
Christoph M. Becker b4f501d5a4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
 2019-11-21 10:01:05 +01:00
Christoph M. Becker 9b92c1d154 Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW 
Apparently, this has not been tested for a long time, and might be a
refactoring relict.  Anyhow, we have to pass the context to
`GIFNextPixel` as well.
 2019-11-21 09:59:26 +01:00
Christoph M. Becker 73f29a5c5e Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Add missing skip keyword in tests
 2019-10-01 11:17:53 +02:00
Christoph M. Becker 2fc5d00afa Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add missing skip keyword in tests
 2019-10-01 11:15:12 +02:00
Fabien Villepinte 209e37db7d Add missing skip keyword in tests 2019-10-01 11:13:36 +02:00
Fabien Villepinte 0aa3acc6c4 Fix borked SKIPIFs 2019-09-30 17:51:41 +02:00
Christoph M. Becker 9818f863c3 Fix parameter order 
`imagecopymerge()` and `imagecopymergegray()` expect the destination
image first, not the other way round.
 2019-08-11 16:16:39 +02:00
Christoph M. Becker 092571c1cb Extend color component range checks 
We also check for alpha components to be within range, and we add yet
missing range checks for other functions as well.
 2019-08-11 15:21:05 +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
Remi Collet 31d85b8417 cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments 2019-07-22 16:14:19 +02:00
Christoph M. Becker f8202b5513 Remove superfluous HAVE_GD_BUNDLED checks 
If we're compiling the bundled libgd, `HAVE_GD_BUNDLED` is set, so
there is no need to check for this macro again.
 2019-07-22 15:59:44 +02:00
Christoph M. Becker d3d3404db7 Drop superfluous ENABLE_GD_TTF 
If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not
defined.  Therefore we can check for `HAVE_LIBFREETYPE` in the first
place.
 2019-07-22 12:01:24 +02:00
Remi Collet fff6b18657 improve temporary fix for system libgd 
- PHP_GD_PNG needed to set include path for png.h
- PHP_GD_JPEG needed to set include path for jpeglib.h
 2019-07-22 09:11:32 +02:00
Remi Collet a85e4d5336 Fixed bug #78314 (missing freetype support/functions with external gd) 2019-07-20 07:57:13 +02:00
Nikita Popov 290e520c03 Use ZEND_HASH_FOREACH APIs in a few more places 2019-07-16 12:20:16 +02:00
Peter Kokot 48abed7fd8 Use e.g. instead of less common f.e. [ci skip] 2019-07-09 17:53:46 +02:00
Peter Kokot a014e50513 Remove HAVE_ERRNO_H from libgd 
The check for errno.h has been removed via
50b9ef8d94

Upstream libgd library is also patched via
https://github.com/libgd/libgd/commit/1e7f93922fb3adf9f131d7e94aa13386062ffe11
 2019-06-28 20:02:11 +02:00
Christoph M. Becker eec5d2a25f Properly shut down font cache mutex 
Since the font cache mutex in set up in MINIT, we have to shut it down
in MSHUTDOWN.
 2019-06-21 16:00:47 +02:00
Christoph M. Becker 81fd113506 Support TGA reading 
We add PHP bindings for libgd's features to read TGA files, which are
available as of libgd 2.1.0.

As PHP's bundled libgd doesn't yet include the respective features of the
external libgd, we add these.

Since TGA has no easily recognizable file signature, we don't add TGA
support for imagecreatefromstring() or getimagesize() and friends.
 2019-06-20 23:40:51 +02:00
Nikita Popov 4488475a3e imagecolorallocate(): Check that RGB components are in-range 
Instead of letting them bleed over into other components.
 2019-06-20 10:09:54 +02:00
Nikita Popov 9b3b07cd26 Suppress shift UB in gd_itofx() 
There doesn't seem to be a corresponding upstream fix for this.
 2019-06-19 17:27:09 +02:00
Nikita Popov 88b603768f imageloadfont: Perform overflow check before calculation 
Instead of afterwards...
 2019-06-19 15:50:52 +02:00
Nikita Popov 2a9fc31021 Fix buffer underflow in gd_gif_in.c 
This has been fixed upstream in
https://github.com/libgd/libgd/commit/939d49a3a9d1cbcd2a37cea9eac9f9e5e9f9de78.
 2019-06-19 15:41:45 +02:00
Nikita Popov ea97fc9c1f Fix shift UB in gd_io.c 
This has already been fixed upstream in
https://github.com/libgd/libgd/commit/24d352576c024769d18113a28f3be03d54fa1e66
and
https://github.com/libgd/libgd/commit/772d0107a6b00a0d6d7191383fe984f8c018b48c.
 2019-06-19 15:09:00 +02:00
Christoph M. Becker 3c5bb06536 Add BMP support to PHP info 2019-06-13 13:07:01 +02:00
Christoph M. Becker 37d0c7b0e4 Simplify GD null byte injection tests 
These tests actually check that no file with a name containing a NUL is
created by the GD image output functions.  This is superfluous, since
it is sufficient to check that the function failed, and that an
appropriate warning has been raised.

We also add missing nullbyte injection tests.
 2019-06-12 12:04:01 +02:00
Joe Watkins 2dfa495311 fix flaky gd tests 2019-06-12 07:52:28 +02:00
Nikita Popov e5411e17c7 Remove unused _setEdgePixel() and getPixelOverflowColorTC() functions 2019-06-11 16:59:12 +02:00
Nikita Popov 5c844c1d36 Fix fabs warning in gd_interpolation.c 
Matches upstream code.
 2019-06-11 16:57:24 +02:00
Nikita Popov 2290102172 Remove safeboolean use in gd_jpeg.c 
This is a backport of
https://github.com/libgd/libgd/blob/e5502c7a3f1fe60536ec060f0211d97066c006ea/src/gd_jpeg.c.
 2019-06-11 16:54:45 +02:00
Nikita Popov 0849a621fd Fix abs(long) warnings in gd.c 
I'm fixing this using (int) casts instead of labs() because this is
what upstream GD does.
 2019-06-11 16:50:25 +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 892a188fc9 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix function name
 2019-05-27 17:21:28 -07:00
Stanislav Malyshev e63b2ba310 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix function name
 2019-05-27 17:21:23 -07:00
Stanislav Malyshev 9bca9ef6cf Fix function name 2019-05-27 17:20:56 -07:00
Stanislav Malyshev 5e3dc08826 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm
 2019-05-27 16:49:31 -07:00