archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 14:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
133893 commits 526 branches 1434 tags 869 MiB
Commit graph

92 commits

Author SHA1 Message Date
Remi Collet
aa8d3a8cc6 fix the fix for bug #70976 (imagerotate) 2016-01-12 14:03:35 +01:00
Remi Collet
14e4d393cf fix the fix for bug #70976 (imagerotate) 2016-01-12 13:52:27 +01:00
Stanislav Malyshev
13750cb0a1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Improve fix for bug #70976
  Fixed bug #70661 (Use After Free Vulnerability in WDDX Packet Deserialization)
  Fixed bug #70741: Session WDDX Packet Deserialization Type Confusion Vulnerability
  Fixed #70728
  Fixed bug #70755: fpm_log.c memory leak and buffer overflow
  Fix bug #70976: fix boundary check on gdImageRotateInterpolated
  typofix
 2016-01-05 19:38:29 -08:00
Stanislav Malyshev
2baeb167a0 Improve fix for bug #70976 2015-12-28 23:44:14 -08:00
Stanislav Malyshev
4bb422343f Fix bug #70976: fix boundary check on gdImageRotateInterpolated 2015-12-07 23:33:05 -08:00
Christoph M. Becker
2e34febb73 Fix #66882: imagerotate by -90 degrees truncates image by 1px 
Contrary to the external libgd, the bundled libgd doesn't use optimized
rotation algorithms for negative square angles. We fix that now.

There are other improvements in gdImageRotateInterpolated() in the external
libgd. I'll leave them out for now, in the hope that we'll be able to rejoin
the two libraries rather soon.
 2015-07-13 22:18:56 +02:00
Christoph M. Becker
1a4722a89e Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory 
A temporary image (tmp_im) is created with gdImageTrueColor() and freed with
gdFree() instead of gdImageDestroy(). Let's fix that.
 2015-07-13 18:30:33 +02:00
Christoph M. Becker
fa53d8463f Fix #69024: imagescale segfault with palette based image 
imagescale(..., IMG_BICUBIC) is not supposed to work with palette images, so we
fix that by converting to true color if necessary. Basically the same fix has
already been applied to the external libgd[1].

[1] <723ea520be>
 2015-07-13 15:48:48 +02:00
Remi Collet
44c0581e0c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
 2014-03-12 17:13:31 +01:00
Remi Collet
862c006da1 Fix bug #66887 imagescale - poor quality of scaled image 
Issue with signed char overflow.

Upstream fix:
4b86e06937
 2014-03-12 17:10:51 +01:00
Remi Collet
5bd13c5231 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument
 2014-03-12 15:36:08 +01:00
Remi Collet
f2d5b2b6c6 Fixed Bug #66893i imagescale ignore method argument 
We also have our goto fail; bug.

Upstream fix for libgd
5b42b1178c
 2014-03-12 15:35:42 +01:00
unknown
d32194172a Merge branch 'PHP-5.5' 
* PHP-5.5:
  ensure that the defined interpolation method is used by the generic scaling functions
 2013-09-09 11:56:58 +02:00
unknown
b54b6e30a4 ensure that the defined interpolation method is used by the generic scaling functions 2013-09-09 11:56:05 +02:00
Pierre Joye
a1d0a869be Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
	configure.in
	ext/gd/libgd/gd_interpolation.c
	main/php_version.h
 2013-06-20 22:32:52 +02:00
Pierre Joye
07e52857b5 fix #65070, bgcolor does not use the same format as the input image with imagerotate 2013-06-20 22:19:33 +02:00
Remi Collet
57dd91be82 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed Bug #64962 	imagerotate produce corrupted image
 2013-06-03 15:02:43 +02:00
Remi Collet
3579e81200 Fixed Bug #64962 imagerotate produce corrupted image 
See https://bitbucket.org/libgd/gd-libgd/issue/67/problem-with-gdrotate

This computation need to be done in signed range.
 2013-06-03 15:01:48 +02:00
Pierre Joye
8059ec1832 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64898imagerotate is broken with bilinear interpolation
 2013-05-27 09:22:00 +02:00
Pierre Joye
2f01e06786 fix #64898imagerotate is broken with bilinear interpolation 2013-05-27 09:21:41 +02:00
Pierre Joye
fc666bdb83 Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix #64738, fix implicit type declaration
 2013-04-30 08:03:46 +02:00
Pierre Joye
1a335d20a8 fix #64738, fix implicit type declaration 2013-04-30 07:52:40 +02:00
Pierre Joye
396b1109cf Merge branch 'PHP-5.5' 
* PHP-5.5:
  ws and comment for recommended aa method
 2013-04-09 07:05:03 +02:00
Pierre Joye
83500123d0 ws and comment for recommended aa method 2013-04-09 07:04:52 +02:00
Pierre Joye
21cfbdf42c Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix some unitialized values and typo
 2013-04-09 06:45:24 +02:00
Pierre Joye
85ad65ef40 fix some unitialized values and typo 2013-04-09 06:44:45 +02:00
Pierre Joye
8a85da4a61 merging conflict left over 2013-03-26 17:46:29 +01:00
Pierre Joye
111123af4f conflict 2013-03-26 11:24:00 +01:00
Pierre Joye
5ae6f582fb fix regression, take #2 (merge issue due to git 1.8 default setting changes) 2013-03-26 11:23:15 +01:00
Stanislav Malyshev
c1ac5a20a5 fix typo 2013-03-24 20:04:24 -07:00
Stanislav Malyshev
504ef64c7b fix typo 2013-03-24 20:03:57 -07:00
Pierre Joye
f21f37bb4c Merge branch 'PHP-5.5' 
* PHP-5.5:
  remove comments
 2013-03-25 03:14:40 +01:00
Pierre Joye
1b34ab8ff8 remove comments 2013-03-25 03:14:27 +01:00
Pierre Joye
94c083ba64 fix conflict 2013-03-24 16:54:55 +01:00
Pierre Joye
be3e2bb295 fix generic rotation and 90 degrees & multiples rotation, take #2 2013-03-24 16:52:20 +01:00
Pierre Joye
f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye
f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye
4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
Pierre Joye
f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye
1ec484d3c5 - add imageaffinematrixget and imagematrixconcat 2013-03-20 12:19:03 +01:00
Pierre Joye
a46065ef71 - fix unix build 2013-03-20 09:24:54 +01:00
Pierre Joye
a7a53d369b - add new files for interpolation 2013-03-20 08:10:54 +01:00