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
105,646 Commits 547 Branches 1,483 Tags
fed09a23b7af9024ebb4e7c8fb592752425bdc7a
Commit Graph

523 Commits

Author SHA1 Message Date
Stanislav Malyshev
ebd5f56442 Fix test 2018-07-16 18:52:01 -07:00
Stanislav Malyshev
a536d6d61b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
 2018-07-16 16:53:57 -07:00
Stanislav Malyshev
4e92cd172a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
 2018-07-16 16:52:36 -07:00
Stanislav Malyshev
bddf8140e4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add NEWS
  Fixed bug #76459 windows linkinfo lacks openbasedir check
  Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
  Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
 2018-07-16 15:13:13 -07:00
Stanislav Malyshev
3462efa386 Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data 
Use MAKERNOTE length as data size.
 2018-07-16 14:17:51 -07:00
Stanislav Malyshev
1baeae4270 Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c 2018-07-16 14:16:58 -07:00
Anatol Belski
66badcdc0c Fix test portability 2018-06-09 20:57:17 +02:00
Christoph M. Becker
3fdde65617 Fix #76409: heap use after free in _php_stream_free 
We must not close the stream in exif_read_from_impl(), since it is the
responsibility of the (caller's) caller to do so, if it actually opened
the stream.

We simplify the reproduce script, which is actually about supplying a
path to a directory (opposed to a regular file), and use `.` instead of
`/` to also make it work on Windows.
 2018-06-09 17:52:05 +02:00
Stanislav Malyshev
4c06d929c0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:03:33 -07:00
Stanislav Malyshev
95ee9efa57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 22:00:24 -07:00
Stanislav Malyshev
5a18d7a0df Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix tsrm_ls
  Fix #76129 - remove more potential unfiltered outputs for phar
  Fix test
  Fix bug #76248 - Malicious LDAP-Server Response causes Crash
  Fix bug #76249 - fail on invalid sequences
  Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
  Fix bug #75981: prevent reading beyond buffer start
 2018-04-23 21:59:57 -07:00
Christoph M. Becker
b4e4788c44 Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value 
The MakerNote is not necessarily null-terminated, so we must not use
`strlen()` to avoid OOB reads.  Instead `php_strnlen()` is the proper
way to handle this.
 2018-04-22 20:15:02 -07:00
Christoph M. Becker
281a1754b9 Fix #76164: exif_read_data zend_mm_heap corrupted 
We must not release parsed parameters ourselves, since this is already
done by the engine.
 2018-04-12 23:00:37 +02:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Christoph M. Becker
50bd4996fd Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use PHP_VERSION for exif
 2017-10-11 14:44:43 +02:00
Christoph M. Becker
62098a10aa Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use PHP_VERSION for exif
 2017-10-11 14:43:51 +02:00
Peter Kokot
74124de048 Use PHP_VERSION for exif 2017-10-04 23:25:36 +02:00
Anatol Belski
b8da481a2a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Test to cover the change in ce1a0d97
 2017-08-01 12:51:20 +02:00
Anatol Belski
d9d152b895 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Test to cover the change in ce1a0d97
 2017-08-01 12:50:52 +02:00
Anatol Belski
a8e25fdbf8 Test to cover the change in ce1a0d97 2017-08-01 12:49:45 +02:00
Anatol Belski
2164e3a0b8 fix test 2017-08-01 11:56:23 +02:00
Anatol Belski
ce1a0d971b fix NULL deref 2017-08-01 11:55:32 +02:00
Kalle Sommer Nielsen
c62e5eb0a9 Reduce EXIF test image sizes, there is still one large image left that I will look into reducing if possible (bug50845.jpg) 
The changes in phpts are due to exiftool, I verified that all the images still remain relevant for testing
 2017-07-30 21:59:55 +02:00
Kalle Sommer Nielsen
97ff7bbb36 Lowercase the file extension 2017-07-30 21:59:10 +02:00
Kalle Sommer Nielsen
4d684a6cd7 WS 2017-07-14 03:42:15 +02:00
Kalle Sommer Nielsen
333c362178 Fix test title 2017-07-14 02:02:25 +02:00
Kalle Sommer Nielsen
997e2e5452 Ensure that the stream position is kept between reads 2017-07-14 01:59:23 +02:00
Kalle Sommer Nielsen
f7d9f6456c Turn off EXIF_DEBUG so Travis don't complain at me 2017-07-14 01:18:58 +02:00
Kalle Sommer Nielsen
bf7f6f9078 Don't add a new line to undefined tags in EXIF_DEBUG mode 2017-07-14 01:17:34 +02:00
Kalle Sommer Nielsen
9cf586cdfb Fix compile error with EXIF_DEBUG 2017-07-14 01:12:00 +02:00
Dmitry Stogov
2b7d3fb45f Fixed compilation error 2017-07-12 09:46:22 +03:00
Kalle Sommer Nielsen
7845182edd Remove debug code 2017-07-12 06:12:07 +02:00
Kalle Sommer Nielsen
363bb03b7e We need to check for the length here too, or we crash and no one likes that! :( 2017-07-12 06:11:14 +02:00
Kalle Sommer Nielsen
969eb8345b * Implemented #65187 (exif_read_data/thumbnail: add support for stream resource) 
* ext/exif now uses FAST_ZPP
 2017-07-12 05:43:50 +02:00
Kalle Sommer Nielsen
7bb696dc49 Silent compiler warning 2017-07-08 19:05:28 +02:00
Kalle Sommer Nielsen
38d019979e Fix test 2017-07-08 18:01:51 +02:00
Kalle Sommer Nielsen
ba28d75c2c Deprecated the read_exif_data() alias 2017-07-08 15:02:05 +02:00
Kalle Sommer Nielsen
106386dd98 Fixed file name for case sensitive file systems 2017-07-08 03:34:30 +02:00
Kalle Sommer Nielsen
469206c84e Added test case for bug #73115 which was fixed by recently fixed bugs 2017-07-08 03:30:46 +02:00
Kalle Sommer Nielsen
134047dfde We currently don't use the guessing code, so don't compile it 2017-07-07 12:23:24 +02:00
Kalle Sommer Nielsen
e6903d471e * Fixed bug #72819 (EXIF thumbnails not read anymore) 
* Fixed bug #62523 (php crashes with segfault when exif_read_data called)
* Fixed the poor test case for #62523, which was a HTML document

Fixing #72819 had the side effect of fixing #62523 by supporting the format as seen in bug62523_1.phpt
 2017-07-07 12:20:05 +02:00
Kalle Sommer Nielsen
babc3c522f This should be EXPECT instead of EXPECTF 2017-07-07 11:31:31 +02:00
Kalle Sommer Nielsen
cd8d0aad7f Fixed bug #50660 (exif_read_data(): Illegal IFD offset (works fine with other exif readers)) 2017-07-07 11:29:23 +02:00
Kalle Sommer Nielsen
900ce92c9a Fixed bug #74428 (exif_read_data(): "Illegal IFD size" warning occurs with correct exif format) 2017-07-07 10:20:02 +02:00
Tom Van Looy
04fb3f28ff Remove superfluous semicolons 2017-06-26 00:23:25 +02:00
Kalle Sommer Nielsen
818272ae10 Added more EXIF MAKERNOTE formats: 
- AGFA,
 - Kyocera
 - Ricoh
 - Epson
 2017-05-28 14:00:51 +02:00
Stanislav Malyshev
ca6f679417 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test
 2017-01-15 18:42:44 -08:00
Stanislav Malyshev
2c7909697a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix test
 2017-01-15 18:42:33 -08:00
Stanislav Malyshev
814966ad33 Fix test 2017-01-15 18:42:22 -08:00