Remi Collet
af11f818fb
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fix bug #68656 Report gd library version
2014-12-26 08:35:31 +01:00
Remi Collet
faba230153
Fix bug #68656 Report gd library version
2014-12-26 08:33:21 +01:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00: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
4acc56d5b2
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
fix unserializer patch
move this entry to the correct version
add missing NEWS entry
add missing NEWS entry
Updated or skipped certain 32-bit tests
add NEWS entry for #68594
5.4.37
add more BC breaks
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Fix typo
Hash value must not zero?
2014-12-17 05:29:36 +01:00
Andrea Faulds
1392102b0c
Updated or skipped certain 32-bit tests
2014-12-17 01:06:48 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Andrea Faulds
0ea0b591d7
Merge branch 'zppFailOnOverflow'
...
* zppFailOnOverflow:
Fix MySQLi tests
Fixed gd test
Refactor ZEND_LONG_MAX/MIN checks into ZEND_DOUBLE_FITS_LONG()
Fixed copy-and-paste error
Fix more 32-bit tests
Skip buncha tests on 32-bit
skip simplexml
skip posix 32-bit
skip tests on 32-bit
Fixes simplexml test
Fixes posix tests
Fixes iconv tests
Marked tests as 32-bit
Fixed more 32-bit tests
Fixed some 32-bit tests
Mark said ext/date tests as 32-bit only
Fixed ext/date tests broken by zpp error on overflow
Fixed broken tests
Make zpp fail if NaN passed for int, or out-of-range float for non-capping int
Conflicts:
ext/date/tests/getdate_variation7.phpt
ext/date/tests/localtime_variation3.phpt
2014-12-13 18:38:15 +00: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
Andrea Faulds
175844ca29
Fixed gd test
2014-11-29 02:58:41 +00:00
Stanislav Malyshev
d7808ddae4
Merge branch 'PHP-5.6'
...
* PHP-5.6:
move tests into proper place
2014-11-24 12:27:04 -08:00
Stanislav Malyshev
faa396c67d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
move tests into proper place
2014-11-24 12:26:50 -08:00
Stanislav Malyshev
f86aa349eb
move tests into proper place
2014-11-24 12:26:20 -08: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
Anatol Belski
af7e3064f3
rename intel toolset to icc - shorter
2014-11-07 19:24:17 +01:00
Anatol Belski
7d7182e1b0
fix gd compilation with icc toolset
2014-11-07 19:13:41 +01:00
Ferenc Kovacs
c03b6e1701
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
2014-10-15 19:43:30 +02:00
Ferenc Kovacs
cfa1028d7e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #65171 imagescale() fails
Revert "Bug #41631 : Observe socket read timeouts in SSL streams"
Conflicts:
ext/openssl/xp_ssl.c
2014-10-15 19:42:51 +02:00
Remi Collet
2728e6f017
Fixed Bug #65171 imagescale() fails
...
Third param (height) is set as optional,
but default value = -1 is incorrect
Compute correct height to preserve ratio.
2014-10-15 19:13:25 +02:00
Nikita Popov
7c5da4607c
Fix casts in GD
...
Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 12:23:33 +02:00
Anatol Belski
4b3e198023
removed *.dsw and *.dsp files
2014-09-28 19:02:09 +02:00
Florian MARGAINE
8eb7e7bf7f
Merge branch 'master' into issue-67910
...
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782
Replaces php5 with php7, without whitespace changes.
2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Matteo Beccati
2508ce7aef
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed freetype test on multiple environments
2014-09-16 10:23:03 +02:00
Matteo Beccati
24ed330a22
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed freetype test on multiple environments
2014-09-16 10:22:49 +02:00
Matteo Beccati
b8470e19e4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed freetype test on multiple environments
2014-09-16 10:22:34 +02:00
Matteo Beccati
00525b824a
Fixed freetype test on multiple environments
...
Some environments, apparently regardless to the freetype version, output 155, while others 156. I guess we can accept both ;)
This reverts commit 592df89027
.
2014-09-16 10:19:29 +02:00
Matteo Beccati
d1b0066df7
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:17 +02:00
Matteo Beccati
627704b38e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed test with freetype >= 2.4.12
2014-09-03 09:45:09 +02:00
Matteo Beccati
72c9b0e12b
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed test with freetype >= 2.4.12
2014-09-03 09:44:59 +02:00
Matteo Beccati
592df89027
Fixed test with freetype >= 2.4.12
2014-09-03 09:43:29 +02:00
Anatol Belski
451856420c
data type fixes
2014-08-29 12:53:37 +02:00
Anatol Belski
6db8d4f829
's' works with size_t round 3
2014-08-27 20:49:36 +02:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
af59e92b24
master renames phase 7
2014-08-25 21:51:49 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Lior Kaplan
0cf2dbdf58
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:31:10 +03:00
Lior Kaplan
6e87b01e95
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946
Bug #67730 : Add tests by Ryan Mauger <ryan@rmauger.co.uk>
2014-08-25 00:29:05 +03:00
Anatol Belski
70de6180d5
fixes to %pd format usage
2014-08-24 02:35:34 +02:00
Anatol Belski
53a8d8e627
Merge remote-tracking branch 'php/master'
2014-08-20 00:34:17 +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
Anatol Belski
48ba0a7962
ported ext/gd
2014-08-19 22:03:57 +02:00
Anatol Belski
40912abf1d
Merge remote-tracking branch 'php/master'
...
Conflicts:
ext/xsl/xsltprocessor.c
2014-08-19 12:56:29 +02:00
Stanislav Malyshev
ff6b30c818
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:38 -07:00
Stanislav Malyshev
fae17a00f5
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:25 -07:00
Stanislav Malyshev
b278be894f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:09 -07:00
Anatol Belski
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Stanislav Malyshev
706aefb781
Fix bug #67730 - Null byte injection possible with imagexxx functions
2014-08-18 22:49:10 -07:00
Dmitry Stogov
4c716e8b51
Merge branch 'master' into test
...
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631 : Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
2014-08-11 11:38:41 +04: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
Dmitry Stogov
7fcd4064c0
Merge branch 'master' into phpng
...
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb
Add bug fix to NEWS
Update UPGRADING according to bug fix
fix test
improve CURL tests to allow testing without separate server
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
- Move checking
- Fixed missing NULL check in SimpleXMLElement::xpath()
- Fixed missing NULL check
...
Conflicts:
ext/bz2/bz2.c
ext/gd/gd.c
ext/mbstring/php_mbregex.c
ext/session/tests/031.phpt
ext/simplexml/simplexml.c
ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
Dmitry Stogov
b8b8c497c4
In most user extensions functions like mysql_close() should use zend_list_close() instead of zend_list_delete(). This closes the actual connection and frees extension specific data structures, but doesn't free zend_reference structure that might be referenced from zval(s). This also doesn't decrement the resource reference counter.
2014-05-13 13:18:00 +04:00
Xinchen Hui
9081a1bdfb
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
Stanislav Malyshev
eaa39c9388
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
Stanislav Malyshev
291b45afb5
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-11 18:14:57 -07:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04: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
Anatol Belski
983e105d6b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix include search
2014-03-12 19:25:44 +01:00
Anatol Belski
75486555c2
fix include search
2014-03-12 19:25:20 +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
Remi Collet
a498e64914
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed Bug #66893i imagescale ignore method argument
2014-03-12 15:36:52 +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
Remi Collet
ee06def81b
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fixed Bug #66890 imagescale segfault
2014-03-12 13:47:36 +01:00
Remi Collet
c8c1205d84
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #66890 imagescale segfault
2014-03-12 13:46:51 +01:00
Remi Collet
dada2f550f
Fixed Bug #66890 imagescale segfault
...
zend_parse_parameters "l" expect long, not int
2014-03-12 13:44:58 +01:00
Pierre Joye
c1732700db
Merge branch 'PHP-5.6'
...
* PHP-5.6:
update news
- fix #66869 , Invalid 2nd argument crashes imageaffinematrixget
add vc12 (2013)
2014-03-09 21:18:23 +01:00
Pierre Joye
ba79c45174
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update news
- fix #66869 , Invalid 2nd argument crashes imageaffinematrixget
add vc12 (2013)
Conflicts:
win32/build/confutils.js
2014-03-09 21:17:06 +01:00
Pierre Joye
8e3c2015dc
- fix #66869 , Invalid 2nd argument crashes imageaffinematrixget
2014-03-09 21:12:19 +01:00
Remi Collet
3686b6bd90
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
2014-03-05 10:44:12 +01:00
Remi Collet
cf89ff3d24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
2014-03-05 10:44:04 +01:00
Remi Collet
af09d8b96a
Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
...
This amends commit 8f4a537
, which aimed to correct NULL dereference because of
missing check of gdImageCreateTrueColor() / gdImageCreate() return value. That
commit checks for negative crop rectangle width and height, but
gdImageCreate*() can also return NULL when width * height overflows. Hence
NULL deref is still possible, as gdImageSaveAlpha() and gdImagePaletteCopy()
is called before dst == NULL check.
This moves NULL check to happen right after gdImageCreate*(). It also removes
width and height check before gdImageCreate*(), as the same check is done by
image create functions (with an extra warning).
From thoger redhat com
2014-03-05 10:40:36 +01:00
Xinchen Hui
6557bc48e2
Merge branch 'PHP-5.6'
2014-02-20 11:20:01 +08:00
Xinchen Hui
c0d26bb138
Merge branch 'PHP-5.5' into PHP-5.6
2014-02-20 11:19:52 +08:00
Brad Daily
143bb29c1a
Fixes #66714 : imageconvolution breakage in 5.5.9
...
5.5.9 included some GD fixes related to #66356 . One of those fixes changed the
above section of imageconvolution, but the variable was mistyped.
2014-02-19 15:24:15 -06:00
Scott MacVicar
24092b7196
Merge branch 'PHP-5.6'
...
* PHP-5.6:
imagettftext() uses the last charactermap it found and not the one you want
[libxml] Unit test for libxml_disable_entity_loader()
Add pgsql related change information to NEWS and UPGRADING
2014-02-16 22:51:20 -08:00
Scott MacVicar
796bfb0bd0
imagettftext() uses the last charactermap it found and not the one you want
...
Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.
In an ideal world we can probably iterate through at font write time.
Test Plan:
See said unit test, it's Apache Licensed font included
2014-02-16 22:49:31 -08:00
Paul Tarjan
d599d36d49
Dont ignore errors from FT_Get_Glyph
2014-01-13 16:30:48 -08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Remi Collet
809eb77689
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
minor fix on previous
2013-12-28 14:29:27 +01:00
Remi Collet
464c219ed4
minor fix on previous
2013-12-28 14:29:14 +01:00
Remi Collet
46809869a3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:06 +01:00
Remi Collet
8f4a5373bb
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
Initial fix was PHP stuff
This one is libgd fix.
- filter invalid crop size
- dont try to copy on invalid position
- fix crop size when out of src image
- fix possible NULL deref
- fix possible integer overfloow
2013-12-28 14:22:13 +01:00
Xinchen Hui
04a52443e7
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
main/php_version.h
2013-12-27 14:06:35 +08:00
Xinchen Hui
2938329ce1
Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
...
And also fixed the bug: arguments are altered after some calls
2013-12-27 14:04:59 +08:00
Adam Harvey
d40a5a2797
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Adam Harvey
d7a45a67be
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Switch to using freetype-config for freetype detection.
2013-12-07 19:41:23 -08:00
Adam Harvey
a0955f351c
Switch to using freetype-config for freetype detection.
...
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.
The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.
Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
2013-12-07 19:39:40 -08:00
Felipe Pena
ab7b0f9f43
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fix extern declaration according to definition
2013-10-20 01:16:15 -02:00
Felipe Pena
0d6247f968
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fix extern declaration according to definition
2013-10-20 01:16:10 -02:00
Felipe Pena
a1daebefda
- Fix extern declaration according to definition
2013-10-20 01:16:07 -02: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
Christopher Jones
4824d0f43e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:08:55 -07:00
Christopher Jones
cd14de94d2
Reduce compiler noise by removing unused variables and labels
2013-08-14 21:06:59 -07:00
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Christopher Jones
3fd987f493
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Cleanup temp file
2013-07-09 14:53:05 -07:00
Christopher Jones
cd7e56e536
Cleanup temp file
2013-07-09 14:51:47 -07:00
Remi Collet
8e4e38aaee
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:56 +02:00
Remi Collet
9da4985bf2
fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:50 +02:00
Remi Collet
8c694401bb
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Use same logic to load WebP image that other formats
2013-06-24 11:11:02 +02:00
Remi Collet
8075f1f4a3
Use same logic to load WebP image that other formats
2013-06-24 11:10:52 +02:00
Remi Collet
6c56d785ae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:04:10 +02:00
Remi Collet
b4632d0c12
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:03:12 +02:00
Stanislav Malyshev
46c46921b1
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Require second parameter of imagecrop()
2013-06-23 20:30:03 -07:00
Jakub Vrana
e1acaea4f1
Require second parameter of imagecrop()
2013-06-23 20:29:54 -07:00
Remi Collet
20dbd27108
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
2013-06-21 14:11:33 +02:00
Remi Collet
fc898ee0f9
Fixed Bug #65060 imagecreatefrom... crashes with user streams
...
Fixed Bug #65084 imagecreatefromjpeg fails with URL
Regression introduced in 8a90aad
(drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)
2013-06-21 14:11:04 +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
Stanislav Malyshev
8ac131503d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Merge branch 'pull-request/341'
Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Stanislav Malyshev
02e4d7a290
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562
Merge branch 'pull-request/341'
...
* pull-request/341: (23 commits)
typofixes
2013-06-10 14:20:18 -07:00
Jakub Vrana
46d3738d0a
Fix image method signatures
2013-06-10 02:24:03 -07:00
Jakub Vrana
b787fdebba
Fix image method signatures
2013-06-10 02:13:13 -07: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
Remi Collet
809b13d67b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed Bug #64961 segfault in imagesetinterpolation
2013-06-03 14:17:22 +02:00
Remi Collet
99ea60c2dd
Fixed Bug #64961 segfault in imagesetinterpolation
...
enum type are not long ;) so cannot be used as zend_parse_parameters arg.
2013-06-03 14:15:18 +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