Stanislav Malyshev
3ed0114e7f
Merge branch 'PHP-5.5' into PHP-7.0.7
* 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/intl/locale/locale_methods.c
ext/phar/dirstream.c
ext/phar/tests/bug71331.phpt
ext/standard/file.c
ext/standard/html.c
2016-05-24 18:05:06 -07:00
..
2016-04-27 13:19:29 +02:00
2016-01-01 19:48:25 +02:00
2016-01-01 19:48:25 +02:00
2016-03-03 16:50:01 +01:00
2016-01-01 19:48:25 +02:00
2016-04-29 14:30:19 +02:00
2016-04-05 11:24:23 +02:00
2016-05-05 11:12:17 +08:00
2016-01-01 19:48:25 +02:00
2016-01-01 20:03:16 +02:00
2016-04-27 13:19:29 +02:00
2016-03-31 01:38:22 +02:00
2016-03-03 16:50:01 +01:00
2016-01-08 08:07:15 +01:00
2016-05-24 18:05:06 -07:00
2016-01-01 19:48:25 +02:00
2016-04-26 23:04:29 -07:00
2016-01-01 19:48:25 +02:00
2016-03-03 16:50:01 +01:00
2016-03-01 10:52:49 +01:00
2016-04-29 11:13:15 +08:00
2016-05-24 18:05:06 -07:00
2016-05-06 20:25:24 +08:00
2016-03-09 14:28:38 +01:00
2016-03-03 16:50:01 +01:00
2016-05-05 17:27:34 +08:00
2016-03-03 16:50:01 +01:00
2016-05-09 17:25:53 +02:00
2016-03-17 15:27:36 +08:00
2016-04-18 11:15:01 +10:00
2016-03-17 13:42:34 +01:00
2016-05-05 00:00:56 +02:00
2016-05-06 09:30:41 +02:00
2016-05-05 15:18:17 +08:00
2016-03-22 21:42:21 +01:00
2016-04-05 00:07:02 +02:00
2016-04-06 14:44:23 +02:00
2016-01-04 05:38:15 -08:00
2016-03-03 16:50:01 +01:00
2016-01-04 05:38:15 -08:00
2016-04-01 17:11:58 +02:00
2016-04-06 18:05:39 +02:00
2016-05-01 19:25:39 +02:00
2016-05-09 17:25:53 +02:00
2016-04-28 20:57:44 +03:00
2016-05-01 13:07:01 +02:00
2016-01-01 19:48:25 +02:00
2016-04-29 10:19:55 +01:00
2016-01-01 19:48:25 +02:00
2016-05-10 12:13:10 +02:00
2016-04-15 21:08:51 -07:00
2016-03-30 10:00:28 +02:00
2016-03-08 13:16:08 +01:00
2016-03-03 16:50:01 +01:00
2016-03-28 23:45:15 -07:00
2016-04-08 17:57:51 +08:00
2016-05-02 17:08:15 +02:00
2016-04-28 15:40:28 +01:00
2016-04-12 19:12:45 +02:00
2016-05-24 15:52:15 -07:00
2016-01-01 19:48:25 +02:00
2016-01-01 19:48:25 +02:00
2016-01-01 19:48:25 +02:00
2016-03-03 16:50:01 +01:00
2016-01-01 19:48:25 +02:00
2016-03-02 00:02:33 -08:00
2016-04-27 11:45:29 +02:00
2016-05-03 19:10:40 +02:00
2016-04-26 13:44:52 +03:00
2016-01-01 19:48:25 +02:00
2016-03-14 15:58:05 +01:00
2016-04-26 22:59:09 -07:00
2016-03-03 16:50:01 +01:00