Christoph M. Becker
5621c5faf8
Fix #79687 : Sony picture - PHP Warning - Make, Model, MakerNotes
...
Even if the length of a maker note does not match our expectations
(either because the maker note is corrupted, or because our
expectations do not quite match reality), there is no need to let
parsing fail; we can still go on parsing the other meta information.
2020-06-13 18:30:57 +02:00
Stanislav Malyshev
62e7b80267
Fix test
2020-03-16 22:40:00 -07:00
Stanislav Malyshev
25238bdf60
Fixed bug #79282
2020-03-16 22:40:00 -07:00
Stanislav Malyshev
5cb4686753
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test
Fix bug #78793
2019-12-16 10:04:03 -08:00
Stanislav Malyshev
6d5cddabaf
Fix test
2019-12-16 10:03:43 -08:00
Stanislav Malyshev
c14eb8de97
Fix bug #78793
2019-12-16 01:14:58 -08:00
Stanislav Malyshev
b74a300edf
Fix build - no model field anymore
2019-12-16 01:10:42 -08:00
Stanislav Malyshev
a65b8abf2c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78910
Fix #78878 : Buffer underflow in bc_shift_addsub
Fix test
Fix #78862 : link() silently truncates after a null byte on Windows
Fix #78863 : DirectoryIterator class silently truncates after a null byte
2019-12-16 00:38:54 -08:00
Stanislav Malyshev
d348cfb96f
Fixed bug #78910
2019-12-16 00:10:39 -08:00
Nikita Popov
a0163417ef
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-09 17:33:44 +02:00
Nikita Popov
daf1fc6e31
Avoid float to int cast UB in exif
2019-10-09 17:33:29 +02:00
Nikita Popov
cbf589b17c
Merge branch 'PHP-7.2' into PHP-7.3
2019-10-09 14:58:01 +02:00
Nikita Popov
d6ca174d5b
Remove redundant components < 0 check
...
components is an unsigned number, it cannot be smaller than zero.
2019-10-09 14:57:24 +02:00
Christoph M. Becker
9fd555f99e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add missing SKIPIFs in exif tests
2019-10-08 14:12:12 +02:00
Fabien Villepinte
46894580b0
Add missing SKIPIFs in exif tests
2019-10-08 14:11:32 +02:00
Nikita Popov
9cd365e571
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-22 12:10:42 +02:00
Nikita Popov
f989a4cd44
Fix leak of temporary buffer during exif tag reading
2019-09-22 12:10:17 +02:00
Nikita Popov
623d897998
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-22 10:26:57 +02:00
Nikita Popov
0701835c01
Fix multiple leaks in exif_read_data()
...
This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.
2019-09-21 20:40:03 +02:00
Nikita Popov
e76dea4283
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-19 21:14:40 +02:00
Nikita Popov
0fa13028cb
Fix out-of-bounds read in exif tag reading
...
This issue was recently introduced in c739023a50 ,
when the restriction that components>0 has been relaxed. We now need
to make sure that any tags that expect at least one component check
that this is the case.
2019-09-19 21:11:57 +02:00
Nikita Popov
6bf5c8508a
Merge branch 'PHP-7.2' into PHP-7.3
2019-09-19 14:20:04 +02:00
Nikita Popov
3e139a4653
Fix exif leak on duplicate copyright tags
2019-09-19 14:19:31 +02:00
Christoph M. Becker
31f617d9bc
Fix exif build
...
As of PHP 7.3.0 the `model` field is removed.
2019-09-12 09:13:27 +02:00
Kalle Sommer Nielsen
6f0e5a45ff
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:31:52 +03:00
Kalle Sommer Nielsen
2823e938d4
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
2019-09-12 06:21:39 +03:00
Stanislav Malyshev
d69894734d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77919 : Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 13:20:44 -07:00
Stanislav Malyshev
284fb08fdc
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77919 : Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 13:19:16 -07:00
Nikita Popov
68fd435ba8
Fixed bug #78333
...
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
2019-07-29 11:27:21 +02:00
Nikita Popov
727929765b
Merge branch 'PHP-7.2' into PHP-7.3
2019-07-29 11:26:09 +02:00
Nikita Popov
d142dfc93d
Fixed bug #78333
...
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
2019-07-29 11:25:27 +02:00
Stanislav Malyshev
aeb6d13185
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
2019-07-29 00:53:37 -07:00
Stanislav Malyshev
dea2989ab8
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
2019-07-29 00:53:28 -07:00
Stanislav Malyshev
13dffa9d32
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:09 -07:00
Stanislav Malyshev
66b32f25d5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:43 -07:00
Stanislav Malyshev
cb5af4e8a0
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:32 -07:00
Stanislav Malyshev
f80ad18afa
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
...
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
2019-04-30 00:05:23 -07:00
Remi Collet
002983e463
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix paste issue
2019-04-02 11:05:54 +02:00
Remi Collet
f7755163b7
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
fix paste issue
2019-04-02 11:05:39 +02:00
Remi Collet
dc1cd3daf2
fix paste issue
2019-04-02 11:05:09 +02:00
Christoph M. Becker
b8fdaa7c42
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Pointer arithmetic on void pointers is illegal
2019-04-02 10:41:26 +02:00
Christoph M. Becker
f6efe70505
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Pointer arithmetic on void pointers is illegal
2019-04-02 10:40:56 +02:00
Christoph M. Becker
01a4de5c58
Pointer arithmetic on void pointers is illegal
...
We quick-fix this by casting to char*; it might be more appropriate to
use char pointers in the first place.
2019-04-02 10:39:44 +02:00
Stanislav Malyshev
da5fbb8c36
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
2019-04-02 00:13:00 -07:00
Stanislav Malyshev
c83af86f8b
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
2019-04-02 00:12:54 -07:00
Stanislav Malyshev
887a7b5714
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
2019-04-02 00:12:26 -07:00
Stanislav Malyshev
9efaac30ae
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
2019-03-31 23:09:57 -07:00
Stanislav Malyshev
f3ab302270
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
2019-03-31 23:09:18 -07:00