diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-24 23:58:50 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-24 23:58:50 +0800 |
| commit | 393d56f1e34f27ae33de6f33adc79866061e6add (patch) | |
| tree | 3d19aba0e7dd0134f0ed96640cc5c5c4e718e49c /ext/zip/php_zip.c | |
| parent | fcc93865786e3fcf53585562d4fc3d8b989b2619 (diff) | |
| parent | ad96a052d918c7fcfaab702c4319acac20435d6b (diff) | |
| download | php-git-393d56f1e34f27ae33de6f33adc79866061e6add.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72660 (NULL Pointer dereference in zend_virtual_cwd)
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 484724aef6..0bd74d5a6c 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -1619,10 +1619,10 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /* { struct zip *intern; zval *self = getThis(); - char *path = NULL; + char *path = "."; char *remove_path = NULL; char *add_path = NULL; - size_t add_path_len, remove_path_len = 0, path_len = 0; + size_t add_path_len, remove_path_len = 0, path_len = 1; zend_long remove_all_path = 0; zend_long flags = 0; zval *options = NULL; |