diff options
| author | Anatol Belski <ab@php.net> | 2014-12-10 11:47:34 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-10 11:47:34 +0100 |
| commit | 4a82cdce6633ec8d7bb5ffdbe726e14e9d70e512 (patch) | |
| tree | 2b711f2b26c28082fa533213c66fa45a74d157d8 /sapi/phpdbg/phpdbg_utils.c | |
| parent | e6f9059a8662c2e078371c7982d4711d8e51f83c (diff) | |
| parent | 20d93534d5de742fb156e922a5d01255a1f1256e (diff) | |
| download | php-git-4a82cdce6633ec8d7bb5ffdbe726e14e9d70e512.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68545 NULL pointer dereference in unserialize.c
Conflicts:
ext/standard/var_unserializer.c
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
0 files changed, 0 insertions, 0 deletions