summaryrefslogtreecommitdiff
path: root/ext/wddx
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2017-06-031-4/+0
|\
| * Fix leak in WDDX serializationNikita Popov2017-06-031-4/+0
| |
| * Update copyright headers to 2017Sammy Kaye Powers2017-01-043-3/+3
| |
* | Update copyright headers to 2017Sammy Kaye Powers2017-01-043-3/+3
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-022-16/+43
|\ \ | |/ | | | | | | | | * PHP-7.0: Fix #73832 - leave the table in a safe state if the size is too big. Fix bug #73831 - NULL Pointer Dereference while unserialize php object
| * Fix bug #73831 - NULL Pointer Dereference while unserialize php objectStanislav Malyshev2016-12-312-16/+43
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-062-4/+7
|\ \ | |/ | | | | | | * PHP-7.0: fix leak, take on 7.x
| * fix leak, take on 7.xAnatol Belski2016-12-062-4/+7
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-12-051-1/+2
|\ \ | |/ | | | | | | * PHP-7.0: This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-12-051-1/+2
| |\ | | | | | | | | | | | | * PHP-5.6: This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
| | * This still leaks memory, I don't have enough knowledge in WDDX code to fix ↵Stanislav Malyshev2016-12-051-1/+2
| | | | | | | | | | | | them :(
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-12-052-0/+24
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Fix bug #73631 - Invalid read when wddx decodes empty boolean element
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-12-052-0/+24
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Fix bug #73631 - Invalid read when wddx decodes empty boolean element
| | * Fix bug #73631 - Invalid read when wddx decodes empty boolean elementStanislav Malyshev2016-12-052-0/+24
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-081-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix memory leak
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-11-081-0/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: fix memory leak
| | * fix memory leakAnatol Belski2016-11-081-0/+1
| | |
| | * Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handleStanislav Malyshev2016-10-234-34/+54
| | | | | | | | | | | | | | | Proper soltion would be to call serialize/unserialize and deal with the result, but this requires more work that should be done by wddx maintainer (not me).
| | * Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.cStanislav Malyshev2016-09-122-9/+108
| | |
| | * Fix bug #72860: wddx_deserialize use-after-freeStanislav Malyshev2016-09-122-1/+29
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-11-084-23/+49
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash Fix #72696: imagefilltoborder stackoverflow on truecolor images Fix #72482: Ilegal write/read access caused by gdImageAALine overflow Fix bug #73144 and bug #73341 - remove extra dtor remove unreferenced var came in with merge Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle Fix #72696: imagefilltoborder stackoverflow on truecolor images Fix #72482: Ilegal write/read access caused by gdImageAALine overflow fix version set versions Fix bug #73144 and bug #73341 - remove extra dtor Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
| * | remove unreferenced var came in with mergeAnatol Belski2016-11-011-2/+0
| | |
| * | Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handleStanislav Malyshev2016-11-014-22/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proper soltion would be to call serialize/unserialize and deal with the result, but this requires more work that should be done by wddx maintainer (not me). (cherry picked from commit 6045de69c7dedcba3eadf7c4bba424b19c81d00d) Conflicts: ext/wddx/wddx.c
* | | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2016-09-123-10/+139
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (22 commits) Fix bug #72293 - Heap overflow in mysqlnd related to BIT fields I don't think 8cceb012a7aabf3c36ab7c2724a436f976cdd165 is needed Fix test Add check in fgetcsv in case sizeof(unit) != sizeof(size_t) Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c Fix bug #73035 (Out of bound when verify signature of tar phar in phar_parse_tarfile) Fix bug #73052 - Memory Corruption in During Deserialized-object Destruction Fix bug #73029 - Missing type check when unserializing SplArray Fix bug #72860: wddx_deserialize use-after-free Fix bug #73007: add locale length check Fix bug #72928 - Out of bound when verify signature of zip phar in phar_parse_zipfile sync NEWS Revert "Merge branch 'PHP-5.6' into PHP-7.0" Merge branch 'PHP-5.6' into PHP-7.0 Merge branch 'PHP-5.6' into PHP-7.0 Revert "Revert "Merge branch 'PHP-5.6' into PHP-7.0"" fix version sync NEWS Fix bug #72957 set versions ...
| * | Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.cStanislav Malyshev2016-09-122-9/+108
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit bbaf784f8d213e201baf67e861f20b38c6e87d3b) Conflicts: ext/wddx/wddx.c
| * | Fix bug #72860: wddx_deserialize use-after-freeStanislav Malyshev2016-09-122-1/+31
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ee552853ff4d72f626102025133e2cd1575043ee) Conflicts: ext/wddx/wddx.c
* | | fix testAnatol Belski2016-08-181-2/+2
| | | | | | | | | | | | | | | | | | The improvements to the base64 functionality allows now to loosen strictness. Strict mode still can be activated later, if there are any issues.
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix char * vs zend_string *
| * | fix char * vs zend_string *Anatol Belski2016-08-171-1/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-171-11/+9
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Avoid duplicating string
| * | Avoid duplicating stringXinchen Hui2016-08-171-11/+9
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-172-6/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Revert "fix tests"
| * | Revert "fix tests"Anatol Belski2016-08-172-6/+4
| | | | | | | | | | | | | | | | | | | | | This reverts commit a47df5be1999b30df0d6d9161e57e760443c9eec. Looks like some environment issue, as some system throws the notice, some don't. Revert for now.
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-171-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix leak
| * | fix leakAnatol Belski2016-08-171-0/+2
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-176-10/+160
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (48 commits) Update NEWs Unused label Fixed bug #72853 (stream_set_blocking doesn't work) fix test Bug #72663 - part 3 Bug #72663 - part 2 Bug #72663 - part 1 Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access ... Conflicts: ext/standard/var_unserializer.c
| * | Bug #72663 - part 3Nikita Popov2016-08-171-1/+1
| | | | | | | | | | | | | | | When using the php_serialize session serialization handler, do not use the result of the unserialization if it failed.
| * | Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-08-171-4/+7
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (24 commits) Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access Fix bug#72697 - select_colors write out-of-bounds Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF Fix bug #72750: wddx_deserialize null dereference Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack Improve fix for #72663 Fix bug #70436: Use After Free Vulnerability in unserialize() Fix bug #72749: wddx_deserialize allows illegal memory access ... Conflicts: Zend/zend_API.h ext/bz2/bz2.c ext/curl/interface.c ext/ereg/ereg.c ext/exif/exif.c ext/gd/gd.c ext/gd/tests/imagetruecolortopalette_error3.phpt ext/gd/tests/imagetruecolortopalette_error4.phpt ext/session/session.c ext/snmp/snmp.c ext/standard/base64.c ext/standard/ftp_fopen_wrapper.c ext/standard/quot_print.c ext/standard/url.c ext/standard/uuencode.c ext/standard/var.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re ext/wddx/tests/bug72790.phpt ext/wddx/tests/bug72799.phpt ext/wddx/wddx.c sapi/cli/generate_mime_type_map.php
| | * Fix for bug #72790 and bug #72799Stanislav Malyshev2016-08-163-5/+72
| | |
| | * Fix bug #72750: wddx_deserialize null dereferenceStanislav Malyshev2016-08-162-2/+40
| | |
| | * Fix bug #72749: wddx_deserialize allows illegal memory accessStanislav Malyshev2016-08-162-6/+48
| | |
| | * Add missing TSRMLS_FETCH()Nikita Popov2016-07-301-0/+1
| | |
| * | Fix bug #72749: wddx_deserialize allows illegal memory accessStanislav Malyshev2016-08-162-4/+46
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 659a21dc20f0b64dafd8cb16573059d3b45cce6b) Conflicts: ext/wddx/wddx.c
| * | Fix bug #72750: wddx_deserialize null dereferenceStanislav Malyshev2016-08-162-1/+39
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6930a1d12c47aa1d2675837852910d177b0ceb11) Conflicts: ext/wddx/wddx.c
| * | fix testsAnatol Belski2016-08-162-4/+6
| | |
| * | add missing skipif sectionAnatol Belski2016-08-161-0/+2
| | |
| * | Fix for bug #72790 and bug #72799Stanislav Malyshev2016-08-163-1/+64
| | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a14fdb9746262549bbbb96abb87338bacd147e1b) Conflicts: ext/wddx/wddx.c
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-301-6/+4
|\ \ \ | |/ /
| * | Fix incorrect mergeNikita Popov2016-07-301-6/+4
| | | | | | | | | | | | Forgot to amend the merge fixes...
* | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-07-302-1/+21
|\ \ \ | |/ /
View Lorry Controller Status