diff options
| -rw-r--r-- | ext/phar/phar.c | 3 | ||||
| -rw-r--r-- | ext/phar/phar_object.c | 4 | ||||
| -rw-r--r-- | ext/phar/util.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 70ca17fb42..866eb41b18 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -667,7 +667,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, int fname_len, char php_uint32 manifest_len, manifest_count, manifest_flags, manifest_index, tmp_len, sig_flags; php_uint16 manifest_ver; long offset; - int register_alias, sig_len, temp_alias = 0; + int sig_len, register_alias = 0, temp_alias = 0; char *signature = NULL; if (pphar) { @@ -3391,6 +3391,7 @@ static zend_op_array *phar_compile_file(zend_file_handle *file_handle, int type res = phar_orig_compile_file(file_handle, type TSRMLS_CC); } zend_catch { failed = 1; + res = NULL; } zend_end_try(); if (name) { diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 38ef95fbd1..6abf5c33b2 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -663,7 +663,7 @@ PHP_METHOD(Phar, webPhar) const char *basename; int fname_len, entry_len, code, index_php_len = 0, not_cgi; phar_archive_data *phar = NULL; - phar_entry_info *info; + phar_entry_info *info = NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!s!saz", &alias, &alias_len, &index_php, &index_php_len, &f404, &f404_len, &mimeoverride, &rewrite) == FAILURE) { return; @@ -890,7 +890,7 @@ PHP_METHOD(Phar, webPhar) zend_bailout(); } else { - char *tmp, sa; + char *tmp = NULL, sa = '\0'; sapi_header_line ctr = {0}; ctr.response_code = 301; ctr.line_len = sizeof("HTTP/1.1 301 Moved Permanently")+1; diff --git a/ext/phar/util.c b/ext/phar/util.c index 2d9383bc08..22403e8ff0 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -124,7 +124,7 @@ php_stream *phar_get_efp(phar_entry_info *entry, int follow_links TSRMLS_DC) /* int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t position, int follow_links TSRMLS_DC) /* {{{ */ { php_stream *fp = phar_get_efp(entry, follow_links TSRMLS_CC); - off_t temp = 0, eoffset = 0; + off_t temp, eoffset; if (!fp) { return -1; @@ -154,6 +154,8 @@ int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t positi case SEEK_SET: temp = eoffset + offset; break; + default: + temp = 0; } if (temp > eoffset + (off_t) entry->uncompressed_filesize) { @@ -1203,7 +1205,7 @@ int phar_get_archive(phar_archive_data **archive, char *fname, int fname_len, ch phar_archive_data *fd, **fd_ptr; char *my_realpath, *save; int save_len; - ulong fhash, ahash; + ulong fhash, ahash = 0; phar_request_initialize(TSRMLS_C); |