summaryrefslogtreecommitdiff
path: root/ext/exif
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-012-2/+2
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-012-2/+2
| |
* | Merge branch 'PHP-5.6'Stanislav Malyshev2015-09-021-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (21 commits) fix unit tests update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix bug ##70284 (Use after free vulnerability in unserialize() with GMP) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) ... Conflicts: ext/exif/exif.c ext/gmp/gmp.c ext/pcre/php_pcre.c ext/session/session.c ext/session/tests/session_decode_variation3.phpt ext/soap/soap.c ext/spl/spl_observer.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/xsl/xsltprocessor.c
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-09-011-106/+106
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS add NEWS for fixes Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/zip/php_zip.c
| | * Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-09-011-106/+106
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Improve fix for #70172 Fix bug #70312 - HAVAL gives wrong hashes in specific cases fix test add test Fix bug #70366 - use-after-free vulnerability in unserialize() with SplDoublyLinkedList Fix bug #70365 - use-after-free vulnerability in unserialize() with SplObjectStorage Fix bug #70172 - Use After Free Vulnerability in unserialize() Fix bug #70388 - SOAP serialize_function_call() type confusion Fixed bug #70350: ZipArchive::extractTo allows for directory traversal when creating directories Improve fix for #70385 Fix bug #70345 (Multiple vulnerabilities related to PCRE functions) Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte value of 32 bytes) Fix bug #70219 (Use after free vulnerability in session deserializer) Fix for bug #69782 Add CVE IDs asigned (post release) to PHP 5.4.43 Add CVE IDs asigned to #69085 (PHP 5.4.39) 5.4.45 next Conflicts: configure.in ext/pcre/php_pcre.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_version.h
| | | * Improve fix for #70385Stanislav Malyshev2015-08-291-2/+2
| | | |
| | | * Fix bug #70385 (Buffer over-read in exif_read_data with TIFF IFD tag byte ↵Stanislav Malyshev2015-08-281-104/+104
| | | | | | | | | | | | | | | | value of 32 bytes)
* | | | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-6/+2
| | | |
* | | | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-6/+6
| | | | | | | | | | | | | | | | semantick changes).
* | | | Fix more proto commentsRasmus Lerdorf2015-06-231-2/+2
| | | |
* | | | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-221-1/+0
| | | |
* | | | Merge branch 'PHP-5.6'Lior Kaplan2015-04-011-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fix typo: unitialized -> uninitialized Fix typo: unitialized -> uninitialized Conflicts: ext/xmlwriter/php_xmlwriter.c
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-04-011-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix typo: unitialized -> uninitialized
| | * | Fix typo: unitialized -> uninitializedLior Kaplan2015-04-011-1/+1
| | | |
* | | | cleaning up the version macrosAnatol Belski2015-03-232-10/+6
| | | |
* | | | made ZEND_TSRMLS_CACHE_* macros look like function callsAnatol Belski2015-02-161-2/+2
| | | | | | | | | | | | | | | | which also comply with the current semantics for such macros
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-01-203-1/+64
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: 5.4.38 next Updated NEWS Updated NEWS Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0. Fix bug #68799: Free called on unitialized pointer Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) Conflicts: ext/exif/exif.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-01-203-1/+64
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: 5.4.38 next Fix bug #68799: Free called on unitialized pointer Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) Conflicts: ext/standard/var_unserializer.c
| | * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2015-01-203-1/+64
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: 5.4.38 next Fix bug #68799: Free called on unitialized pointer Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) Conflicts: configure.in main/php_version.h
| | | * Fix bug #68799: Free called on unitialized pointerStanislav Malyshev2015-01-113-1/+64
| | | |
| | | * Fix bug #68113 (Heap corruption in exif_thumbnail())Stanislav Malyshev2014-10-133-2/+19
| | | |
| | * | Bump yearXinchen Hui2015-01-152-2/+2
| | | |
| * | | bump yearXinchen Hui2015-01-152-2/+2
| | | |
* | | | bump yearXinchen Hui2015-01-152-2/+2
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-101-104/+104
| | | |
* | | | Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-211-9/+9
| | | |
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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?
| * | | | Updated or skipped certain 32-bit testsAndrea Faulds2014-12-171-1/+3
| | | | |
* | | | | second shot on removing TSRMLS_*Anatol Belski2014-12-141-7/+7
| | | | |
* | | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-173/+173
| | | | |
* | | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-261-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | | Merge branch 'PHP-5.6'Anatol Belski2014-11-241-3/+3
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: fix dir separator in test fork test for windows update for LiteSpeed update for LiteSpeed
| | * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-241-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: fix dir separator in test fork test for windows update for LiteSpeed
| | | * | fix dir separator in testAnatol Belski2014-11-241-3/+3
| | | | |
| | | * | Fix bug #68113 (Heap corruption in exif_thumbnail())Stanislav Malyshev2014-10-143-2/+19
| | | |/
| | * | Fix bug #68113 (Heap corruption in exif_thumbnail())Stanislav Malyshev2014-10-143-2/+19
| | | |
* | | | opcache, intl, gmp, exif, com, bcmath to use static tsrmlsAnatol Belski2014-10-173-3/+9
|/ / /
* | | Fix bug #68113 (Heap corruption in exif_thumbnail())Stanislav Malyshev2014-10-143-2/+19
| | |
* | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-113/+0
| | |
* | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-202-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-192-2/+2
| | | |
| * | | Refactored INI subsystem to use zend_string* instead of char*Dmitry Stogov2014-09-011-7/+7
| | | |
* | | | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-4/+4
|/ / /
* | | 's' works with size_t round 3Anatol Belski2014-08-271-1/+2
| | |
* | | first show to make 's' work with size_tAnatol Belski2014-08-271-2/+2
| | |
* | | master renames phase 3Anatol Belski2014-08-251-1/+1
| | |
* | | master renames phase 1Anatol Belski2014-08-251-15/+15
| | |
* | | fixed exifAnatol Belski2014-08-191-3/+3
| | |
* | | basic macro replacements, all at onceAnatol Belski2014-08-191-12/+12
| | |
* | | Merge branch 'master' into phpngDmitry Stogov2014-06-121-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c