Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Resolve conflict | Sammy Kaye Powers | 2017-01-03 | 2 | -16/+43 |
|\ | |||||
| * | Merge branch 'PHP-7.1' | Stanislav Malyshev | 2017-01-02 | 2 | -16/+43 |
| |\ | |||||
| | * | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2017-01-02 | 2 | -16/+43 |
| | |\ | |||||
| | | * | Fix bug #73831 - NULL Pointer Dereference while unserialize php object | Stanislav Malyshev | 2016-12-31 | 2 | -16/+43 |
* | | | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-02 | 3 | -3/+3 |
|/ / / | |||||
* | | | Merge branch 'PHP-7.1' | Anatol Belski | 2016-12-06 | 2 | -4/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-12-06 | 2 | -4/+7 |
| |\ \ | | |/ | |||||
| | * | fix leak, take on 7.x | Anatol Belski | 2016-12-06 | 2 | -4/+7 |
* | | | Merge branch 'PHP-7.1' | Stanislav Malyshev | 2016-12-05 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2016-12-05 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'PHP-5.6' into PHP-7.0 | Stanislav Malyshev | 2016-12-05 | 1 | -1/+2 |
| | |\ | |||||
| | | * | This still leaks memory, I don't have enough knowledge in WDDX code to fix th... | Stanislav Malyshev | 2016-12-05 | 1 | -1/+2 |
* | | | | Merge branch 'PHP-7.1' | Stanislav Malyshev | 2016-12-05 | 2 | -0/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2016-12-05 | 2 | -0/+24 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'PHP-5.6' into PHP-7.0 | Stanislav Malyshev | 2016-12-05 | 2 | -0/+24 |
| | |\ \ | | | |/ | |||||
| | | * | Fix bug #73631 - Invalid read when wddx decodes empty boolean element | Stanislav Malyshev | 2016-12-05 | 2 | -0/+24 |
* | | | | Removed IS_TYPE_IMMUTABLE (it's the same as COPYABLE & !REFCOUED) | Dmitry Stogov | 2016-11-28 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-11-08 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Anatol Belski | 2016-11-08 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | fix memory leak | Anatol Belski | 2016-11-08 | 1 | -0/+1 |
| | * | Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle | Stanislav Malyshev | 2016-10-23 | 4 | -34/+54 |
| | * | Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c | Stanislav Malyshev | 2016-09-12 | 2 | -9/+108 |
| | * | Fix bug #72860: wddx_deserialize use-after-free | Stanislav Malyshev | 2016-09-12 | 2 | -1/+29 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-11-08 | 4 | -23/+49 |
|\ \ \ | |/ / | |||||
| * | | remove unreferenced var came in with merge | Anatol Belski | 2016-11-01 | 1 | -2/+0 |
| * | | Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle | Stanislav Malyshev | 2016-11-01 | 4 | -22/+50 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Stanislav Malyshev | 2016-09-12 | 3 | -10/+139 |
|\ \ \ | |/ / | |||||
| * | | Fix bug #73065: Out-Of-Bounds Read in php_wddx_push_element of wddx.c | Stanislav Malyshev | 2016-09-12 | 2 | -9/+108 |
| * | | Fix bug #72860: wddx_deserialize use-after-free | Stanislav Malyshev | 2016-09-12 | 2 | -1/+31 |
* | | | fix test | Anatol Belski | 2016-08-18 | 1 | -2/+2 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-08-17 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | fix char * vs zend_string * | Anatol Belski | 2016-08-17 | 1 | -1/+1 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2016-08-17 | 1 | -11/+9 |
|\ \ \ | |/ / | |||||
| * | | Avoid duplicating string | Xinchen Hui | 2016-08-17 | 1 | -11/+9 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-08-17 | 2 | -6/+4 |
|\ \ \ | |/ / | |||||
| * | | Revert "fix tests" | Anatol Belski | 2016-08-17 | 2 | -6/+4 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Anatol Belski | 2016-08-17 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | fix leak | Anatol Belski | 2016-08-17 | 1 | -0/+2 |
* | | | Merge branch 'PHP-7.0' into PHP-7.1 | Xinchen Hui | 2016-08-17 | 6 | -10/+160 |
|\ \ \ | |/ / | |||||
| * | | Bug #72663 - part 3 | Nikita Popov | 2016-08-17 | 1 | -1/+1 |
| * | | Merge branch 'PHP-5.6' into PHP-7.0 | Stanislav Malyshev | 2016-08-17 | 1 | -4/+7 |
| |\ \ | | |/ | |||||
| | * | Fix for bug #72790 and bug #72799 | Stanislav Malyshev | 2016-08-16 | 3 | -5/+72 |
| | * | Fix bug #72750: wddx_deserialize null dereference | Stanislav Malyshev | 2016-08-16 | 2 | -2/+40 |
| | * | Fix bug #72749: wddx_deserialize allows illegal memory access | Stanislav Malyshev | 2016-08-16 | 2 | -6/+48 |
| | * | Add missing TSRMLS_FETCH() | Nikita Popov | 2016-07-30 | 1 | -0/+1 |
| * | | Fix bug #72749: wddx_deserialize allows illegal memory access | Stanislav Malyshev | 2016-08-16 | 2 | -4/+46 |
| * | | Fix bug #72750: wddx_deserialize null dereference | Stanislav Malyshev | 2016-08-16 | 2 | -1/+39 |
| * | | fix tests | Anatol Belski | 2016-08-16 | 2 | -4/+6 |
| * | | add missing skipif section | Anatol Belski | 2016-08-16 | 1 | -0/+2 |
| * | | Fix for bug #72790 and bug #72799 | Stanislav Malyshev | 2016-08-16 | 3 | -1/+64 |