clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
91,253 Commits 494 Branches 1,367 Tags 785 MiB
fabc1b7174
Commit Graph

446 Commits

Author SHA1 Message Date
Christoph M. Becker
fabc1b7174 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #70064: imagescale(..., IMG_BICUBIC) leaks memory
 2015-07-13 18:36:15 +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
959b2c3514 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #69024: imagescale segfault with palette based image
 2015-07-13 15:56:39 +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
Christoph M. Becker
42d1fa29c7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #53154: Zero-height rectangle has whiskers
 2015-07-13 01:46:09 +02:00
Christoph M. Becker
094decc3c0 Fix #53154: Zero-height rectangle has whiskers 
To avoid drawing the corner pixels twice, gdImageRectangle() draws the vertical
lines 2 points shorter than the actual side of the rectangle. However, this
causes "whiskers" for rectangles with height 0. This patch fixes this issue and
at the same time optimizes the algorithm by drawing only a single line for zero
height and zero width rectangles.
 2015-07-13 01:33:00 +02:00
Christoph M. Becker
930a9910d7 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #67447: imagecrop() adds a black line when cropping
 2015-07-12 23:15:06 +02:00
Christoph M. Becker
891ff131ef Fix #67447: imagecrop() adds a black line when cropping 
A simple one-off error: imagecrop)() copied only width-1 and height-1 pixels.
 2015-07-12 23:05:53 +02:00
Christoph M. Becker
ce7b5af03f Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fix #68714: copy 'n paste error
 2015-07-12 16:39:50 +02:00
Christoph M. Becker
ba7c3a1bb4 Fix #68714: copy 'n paste error 
Actually, this is not really a bug fix, but rather a simplification and
optimization in the same vein as has been done with the external libgd, but
going a small step further and joining both for loops.
 2015-07-12 16:32:38 +02:00
Xinchen Hui
6de750efb7 Fixed conditional jump or move depends on uninitialised value(s) 
==11551==    at 0x57CB23C: xpmParseData (parse.c:702)
 2015-07-02 19:02:49 +08:00
Remi Collet
fc8143f58a Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #69479 GD fails to build with newer libvpx
 2015-05-24 09:40:08 +02:00
Remi Collet
565de1ae64 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fixed Bug #69479 GD fails to build with newer libvpx
 2015-05-24 09:39:20 +02:00
Remi Collet
e807e07bfa Fixed Bug #69479 GD fails to build with newer libvpx 
From upstream d41eb72cd4

Fix build with latest libvpx 1.4.0

These new constants exist at least since 1.0.0
Compatibility ones have been droped in 1.4.0
 2015-05-24 09:37:12 +02:00
Stanislav Malyshev
736afd48cf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Reduce downstream patches
 2015-03-22 21:33:52 -07:00
lesniewskister
c12e031530 Reduce downstream patches 
As per http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/php/5.6/patches/patch-ext_gd_libgd_gdcache_h?rev=1.1&content-type=text/x-cvsweb-markup
 2015-03-22 21:33:45 -07:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Stanislav Malyshev
95183cc339 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
 2015-01-04 21:08:16 -08:00
Stanislav Malyshev
184b6d9e73 fix memory leak 2015-01-04 21:07:57 -08:00
Remi Collet
df4aaa81ef Fix Bug #68713 infinite loop / infinite free 
PHP not affected (emalloc never return NULL)
Just to reduce diff with upstream and for legibility

Apply:
3c0d2203b2
4af76c97a4
 2015-01-03 08:34:27 +01:00
Anatol Belski
9c354ba182 Merge remote-tracking branch 'origin/master' into native-tls 
* origin/master:
  Better fix for #68601 for perf 81e9a993f2
  Added EXPECTED(). Most functions have arguments.
 2014-12-17 11:53:45 +01:00
Remi Collet
f61071205f Merge branch 'PHP-5.6' 
* PHP-5.6:
  Better fix for #68601 for perf 81e9a993f2
 2014-12-17 11:01:23 +01:00
Remi Collet
f382fbf4c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Better fix for #68601 for perf 81e9a993f2
 2014-12-17 11:00:52 +01:00
Remi Collet
5fc2fede9c Better fix for #68601 for perf 
81e9a993f2
 2014-12-17 10:59:36 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Remi Collet
de0afce55b Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #68601 buffer read overflow in gd_gif_in.c
 2014-12-13 09:06:24 +01:00
Remi Collet
8bd67ce748 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  Fix bug #68601 buffer read overflow in gd_gif_in.c
 2014-12-13 09:05:33 +01:00
Remi Collet
07b5896a13 Fix bug #68601 buffer read overflow in gd_gif_in.c 2014-12-13 09:03:44 +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
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Sara Golemon
1ec93f8069 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:24:49 -07:00
Sara Golemon
a309dda777 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Switch use of strtok() to gd_strtok_r()
 2014-08-19 13:22:14 -07:00
Sara Golemon
ac4569621d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Switch use of strtok() to gd_strtok_r()

Conflicts:
	NEWS
 2014-08-19 13:17:56 -07:00
Sara Golemon
cbe1597b74 Switch use of strtok() to gd_strtok_r() 
strtok() is not thread safe, so this will potentially break in
very bad ways if used in ZTS mode.

I'm not sure why gd_strtok_r() exists since it seems to do the
same thing as strtok_r(), but I'll assume it's a portability
decision and do as the Romans do.
 2014-08-19 13:16:44 -07:00
Andrey Hristov
3dc9bef819 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
 2014-08-06 16:25:12 +03:00
Andrey Hristov
41e1ccefd5 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
	configure.in
	main/php_version.h
 2014-08-06 15:27:56 +03:00
Remi Collet
3e176e0166 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:51:19 +02:00
Remi Collet
6dcc3f9840 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:50:33 +02:00
Remi Collet
a45b8874fb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
 2014-08-04 10:47:54 +02:00
Remi Collet
cf4753691d Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference 
Upstream 463c3bd09b

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
 2014-08-04 10:42:39 +02:00
Anatol Belski
f407482fcc Merge branch 'PHP-5.6' 
* PHP-5.6:
  made libgd recognize the 9 version series
 2014-03-12 19:31:21 +01:00
Anatol Belski
0bf5bce6ad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  made libgd recognize the 9 version series
 2014-03-12 19:31:07 +01:00
Anatol Belski
3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +01:00
Remi Collet
1db6ecc235 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
 2014-03-12 17:13:55 +01: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