php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-20 22:41:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
96,274 Commits 547 Branches 1,483 Tags
e5beb4e828b2b9b3d79642bd407813c824950310
Commit Graph

41 Commits

Author SHA1 Message Date
Christoph M. Becker
33508a3d47 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-13 16:23:15 +02:00
Christoph M. Becker
82df4e2638 Fix #72278: getimagesize returning FALSE on valid jpg 
getimagesize() is rather strict about the length of the marker payload data,
and fails if there are extraneous bytes before the next marker. Only a very
special case reported in bug #13213 is catered to.

libjpeg is rather resilient to such corrupted JPEG files, and raises a
recoverable error in this case. Other image processors also accept such
JPEG files, so we adapt getimagesize() to skip (but warn about) such
extraneous bytes.
 2016-08-13 16:14:34 +02:00
Christoph M. Becker
cdabbd9542 test requires imagejpeg(); skip otherwise 2015-07-31 13:51:49 +02:00
Christoph M. Becker
87829c09a1 Fix #70052: getimagesize() fails for very large and very small WBMP 
Very large WBMP (width or height greater than 2**31-1) cause an overflow and
circumvent the size limitation of 2048x2048 px. Very small WBMP (less than 12
bytes) cause a read error and are not recognized. This patch fixes both bugs.
 2015-07-23 18:31:28 +02:00
Christoph M. Becker
8c483ce36c Fix #70096: Repeated iptcembed() adds superfluous FF bytes 
When there is already an APP13 marker segment in the file, iptcembed() doesn't
skip the first byte (0xFF) of this segment, what leads to unnecessary and
potentially invalid duplication of this byte. This patch fixes this issue.
 2015-07-18 22:48:54 +02:00
Christoph M. Becker
716387288e Merge branch 'PHP-5.6' 
* PHP-5.6:
  test requires imagejpeg(); skip otherwise
 2015-07-31 13:54:32 +02:00
Christoph M. Becker
de3f60d536 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70052: getimagesize() fails for very large and very small WBMP

Conflicts:
	ext/standard/image.c
 2015-07-23 18:40:54 +02:00
Christoph M. Becker
3ed0d18152 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #70096: Repeated iptcembed() adds superfluous FF bytes

Conflicts:
	ext/standard/iptc.c
 2015-07-18 22:52:39 +02:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Andrea Faulds
01554bf3e4 Merge branch 'master' into zppFailOnOverflow 2014-11-29 01:45:54 +00:00
Andrea Faulds
ebaa42302a Skip buncha tests on 32-bit 2014-11-29 01:05:19 +00:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
Stanislav Malyshev
3e9cb6a4a5 Fix bug #67250 (iptcparse out-of-bounds read) 2014-05-11 19:09:19 -07:00
Gabor Buella
1010200da5 Fixed bug #67024 - getimagesize should recognize BMP files with negative height 2014-04-13 15:17:04 -07:00
Lars Strojny
bf9ad4e661 Support BITMAPV5HEADER in getimagesize(): https://en.wikipedia.org/wiki/BMP_file_format#DIB_header_.28bitmap_information_header.29 2013-01-14 18:52:38 +01:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
1159cd2002 move it to right place 2011-09-06 09:45:21 +00:00
Xinchen Hui
ddd98a9adc move it to right place 2011-09-06 09:45:21 +00:00
Pierre Joye
bd2f9d56ec - #51063, news and test 2010-05-05 13:39:35 +00:00
Scott MacVicar
bb2283bf4e MFH Fix bug #47359 - Use the official unofficial mimetype for bmp files, this stops IE from getting confused. 2009-03-17 03:25:57 +00:00
andy wharmby
294364dfee Fix names of new image files. 2009-01-23 11:18:36 +00:00
andy wharmby
d8ab16b683 New image tests. Tested on WIndows, Linux and Linux 64 bit 2009-01-22 22:59:57 +00:00
Zoe Slattery
f88ab53c3d Commited for Sanjay, reviewed by Pierre. Testfest task 117. 2008-06-13 15:20:04 +00:00
Zoe Slattery
aa8f158276 Commited for Sanjay, reviewed by Pierre. Testfest task 117. 2008-06-13 13:31:18 +00:00
Zoe Slattery
89d3bb2189 Commited for Sanjay, reviewed by Pierre. Testfest task 118. 2008-06-13 13:11:37 +00:00
Marcus Boerger
3be1a372a6 - MFH Add constants and new test (test from testfest.php.net) 2008-05-24 11:53:55 +00:00
Antony Dovgal
c69b76dc52 MFH: fix segfault in iptcembed() 2007-05-10 12:23:25 +00:00
Antony Dovgal
0b073cd34c improve test file 
don't forget to test invalid parameters etc.
 2006-06-25 21:21:59 +00:00
Hannes Magnusson
7b6bf33b03 MFH: image_type_to_mime_type() 2006-06-25 21:06:39 +00:00
foobar
ce742b08b0 - Fix typo (avaliable -> available). (bug #28725) 2004-12-16 12:34:32 +00:00
Moriyoshi Koizumi
6fc22aa5d9 Test name formatting 2003-01-23 19:07:25 +00:00
Ilia Alshanetsky
054826b192 Added missing test result. 2003-01-17 23:57:43 +00:00
Marcus Boerger
973c5fa1ec fix jp2 detection and add testfile 2003-01-17 18:51:30 +00:00
Marcus Boerger
1dabcd4dad - JPEG 2000 support 2003-01-16 19:46:12 +00:00
Marcus Boerger
301330ff88 -Added colordepth for png 
-Added tests for width/heidth for unsigned/signed problems
 2002-11-18 16:51:02 +00:00
Ilia Alshanetsky
ef7bd02688 Added test for swc files (compressed swf files), this must be done in a 
separate test, since this test has a dependency on the zlib extension.
 2002-11-12 17:47:20 +00:00
Ilia Alshanetsky
b6e3ae97c4 Move SWC (compressed swf) check into a separate test because this check 
requires zlib. This separation allows us to skip the test if zlib is
not available and not fail.
 2002-11-08 02:50:28 +00:00
Ilia Alshanetsky
ada01d75e0 Added swf info. 2002-11-07 16:42:32 +00:00
Ilia Alshanetsky
bd41e0503d Added swf and swc (compressed swf) test cases and added 'bits' portion to 
the expected bmp test results.
 2002-11-07 16:38:57 +00:00
Marcus Boerger
81ef4fd958 add tests for functions in image.c (not requiring gd,zlib or exif) 2002-11-03 13:52:45 +00:00