Stanislav Malyshev 544940c48a Merge branch 'PHP-5.5' into PHP-5.6.22 ...

* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
	Zend/zend_operators.c
	ext/phar/dirstream.c
	ext/phar/tests/bug71331.phpt

2016-05-24 16:56:36 -07:00

..

libgd

Merge branch 'PHP-5.5' into PHP-5.6.22

2016-05-24 16:56:36 -07:00

tests

Merge branch 'PHP-5.5' into PHP-5.6.22

2016-05-24 16:56:36 -07:00

config.m4

Fix bug #68656 Report gd library version

2014-12-26 08:33:21 +01:00

config.w32

backport gd config.w32 to support freetype 2.5

2015-02-12 20:27:48 +01:00

CREDITS

…

gd_compat.c

This seems better

2015-11-20 15:36:13 +08:00

gd_compat.h

Revert removal of overflow2 use in gd.c

2013-05-06 10:00:45 +02:00

gd_ctx.c

Happy new year (Update copyright to 2016)

2016-01-01 19:21:47 +02:00

gd.c

Better fix for #71952

2016-04-19 23:44:00 -07:00

gd.dsp

revert change #298288: Remove old dsp/dsw/makefile files

2010-04-28 14:41:51 +00:00

gdcache.c

Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef

2013-05-04 16:50:06 +02:00

gdcache.h

Last bit of CS fixes.

2003-12-28 21:08:46 +00:00

php_gd.h

Happy new year (Update copyright to 2016)

2016-01-01 19:21:47 +02:00