Added support for Minolta EXIF tags

Added support for PENTAX EXIF tags

Remove this redundant entry for Canon

pefree() these (with persistent=0), as internally in zend_multibyte.c they do the same, and at the same time also cast them to void pointers to silence the compiler warnings.

Fix line endings, getting a little annoyed with VS' warning about mismatch

Fixed bug #68547 (Exif Header component value check error) (Patch by sjh21a at gmail dot com)

This patch changes processing a little and causes some crafted tags to not be parsed and generat

Fixed bug #68547 (Exif Header component value check error) (Patch by sjh21a at gmail dot com)

This patch changes processing a little and causes some crafted tags to not be parsed and generate a warning.

This is a slight BC break from earlier versions, since it will no longer return the tags of that it was mismatching (see bug68799.phpt), namely the "WINXP" section and the "Author" tag is no longer returned due to this. Although this BC break is merely only for crafted tags, this can also have some real life effects on pictures re-saved from editors that can cause bad exif data writes, so lets keep it here.

show more ...

Added support for Sony pictures in EXIF as per requested in bug #72735

Sony is a little more interesting, as it is have a large range of tags it support in different models. For now I have a

Added support for Sony pictures in EXIF as per requested in bug #72735

Sony is a little more interesting, as it is have a large range of tags it support in different models. For now I have added all the tags found within the Exif.Sony1 namespace.

show more ...

Use 'p' to validate a path in exif_imagetype() (like the other exif function already does)

improve the check, avoid strlen on NULL

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the E

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.

show more ...

improve the check, avoid strlen on NULL

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the E

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.

(cherry picked from commit aabcb5481d9e717df77192dab2894468b9fc63b4)

show more ...

Fixed bug #72682 (exif_read_data() fails to read all data for some images)

This is fixed by adding DJI signatures to the MAKERNOTE and its supported tags, list is credits to ExifTool documen

Fixed bug #72682 (exif_read_data() fails to read all data for some images)

This is fixed by adding DJI signatures to the MAKERNOTE and its supported tags, list is credits to ExifTool documentation.

show more ...

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the E

Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).

Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.

show more ...

Fixed Redhat bug #1362571 (PHP not returning full results for exif_read_data function)

There are two factors for this bug fix:
- First of all, the maximum nesting level has been increas

Fixed Redhat bug #1362571 (PHP not returning full results for exif_read_data function)

There are two factors for this bug fix:
- First of all, the maximum nesting level has been increased to 150 (previously 100), I'm not sure how much an impact this will have, but increasing this value also seems to resolve PHP bug #66443 (Corrupt EXIF header: maximum directory nesting level reached for some cameras.)
- Second, this adds support for most common Panasonic EXIF tags, again this list is based off the Exiv2 website

Note about Panasonic's format:
From what I could find, then the offset was always 12 bytes for such, the signature always had the 'P' capitalized, and the rest lower cased, followed by 3 NULL bytes

@Remi, can you review this? I'm gonna look into Sony (which is huge btw!) and your patch next

show more ...

Fixed bug #72735 (Samsung picture thumb not read (zero size))

It seems like there is no maker data for "Samsung", this causes the IDF tag parsing to fail, and it bails early on, despite ther

Fixed bug #72735 (Samsung picture thumb not read (zero size))

It seems like there is no maker data for "Samsung", this causes the IDF tag parsing to fail, and it bails early on, despite there still is valid remaining data in image, such as the thumbnail data as reported in the bug.

I used the Exiv2 website as a reference guide for tags that's specific to Samsung's EXIF data, which should also mean that we will be able to name some of those tags more specifically now.

I have chosen again not to commit this to other branches, simply because I'm not 100% sure on the byte order and offsets for Samsung, I did some research and it seems like there are many variants, but this (very copy/pasted), entry works for this particular image and does not break any other tests. This does add a new feature I suppose, while also fixing a bug, but I will leave it to the other branch RMs to decide on how far down they will want to merge this.

show more ...

Revert "Fixed bug #72735 (Samsung picture thumb not read (zero size))"

This reverts commit 406dff2a02ff1cfac89942ce5e991d88d3b6cb50.

This seems to break more than expected and other

Revert "Fixed bug #72735 (Samsung picture thumb not read (zero size))"

This reverts commit 406dff2a02ff1cfac89942ce5e991d88d3b6cb50.

This seems to break more than expected and other tests seems to fail:
- bug60150.phpt
- bug62523_2.phpt
- bug72603.phpt
- bug72618.phpt

I'm gonna go do around of thinking and see if I can come up with a better fix

show more ...

Fixed bug #72735 (Samsung picture thumb not read (zero size))

This fix is only committed to master for now. I'm no exif expert on this matter, so someone else might want to take a look over

Fixed bug #72735 (Samsung picture thumb not read (zero size))

This fix is only committed to master for now. I'm no exif expert on this matter, so someone else might want to take a look over this and merge as wanted in case this will break something.

In exif_process_IFD_in_JPEG() we loop over the tag entries and try to process the IFD tag, this is fine and all, however in case one fail to process correctly, the entire routine is aborted, which means that other possible data, such as the thumbnail data as reported in #72735 may not be read, despite it is there, perfectly valid.

Also, big props to whoever added EXIF_DEBUG, this rocks!

show more ...

Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment

Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE

Fixed compilation warnings

Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

When the location of the data is outside of the range we have
preloaded (for example, if it's before the beg

Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

When the location of the data is outside of the range we have
preloaded (for example, if it's before the beginning of the IFD
structure), we have to read it from the stream into a separate buffer.
The offset calculations in this case were incorrect, resulting in
bogus values being read for the affected fields (sometimes parts of
other fields, sometimes binary data).

The included test image, sourced from [1], is in the public domain.

[1] https://commons.wikimedia.org/wiki/File:U.S._Marines_Prepare_to_board_an_MV-22_Osprey_160509-M-AF202-041.jpg

show more ...

Fix bug #72094 - Out of bounds heap read access in exif header processing

Eliminate usages of _PP macros

These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).

One usage was in php_stream_get_

Eliminate usages of _PP macros

These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).

One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.

There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.

show more ...

Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE

Also re bug #71575.