com php-src: next portion of fixes for ext/phar: ext/phar/dirstream.c ext/phar/func_interceptors.c ext/phar/phar.c ext/phar /phar_internal.h
ext/phar/phar_object.c ext/phar/st ream.c ext/phar/tar.c ext/phar/util.c ext/phar/zip .c

Commit: d135198559cd14805b42a2ddbe48511674475c40 Author: Anatol Belski <ab@php.net> Wed, 27 Nov 2013 23:35:42 +0100 Parents: 2c3cc2e10716c1aece232aaf748dc84897996895 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d135198559cd14805b42a2ddbe48511674475c40 Log: next portion of fixes for ext/phar Changed paths: M ext/phar/dirstream.c M ext/phar/func_interceptors.c M ext/phar/phar.c M ext/phar/phar_internal.h M ext/phar/phar_object.c M ext/phar/stream.c M ext/phar/tar.c M ext/phar/util.c M ext/phar/zip.c

diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c index 23a63ef..5d1969b 100644 --- a/ext/phar/dirstream.c +++ b/ext/phar/dirstream.c @@ -307,7 +307,7 @@ php_stream *phar_wrapper_open_dir(php_stream_wrapper *wrapper, const char *path, php_uint_t unused; phar_archive_data *phar; phar_entry_info *entry = NULL; - uint host_len; + zend_str_size_uint host_len; if ((resource = phar_parse_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar url \"%s\" is unknown", path); diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index 5b5ff21..6b83274 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -635,7 +635,7 @@ static void phar_file_stat(const char *filename, php_stat_len filename_length, i arch_len = PHAR_G(last_phar_name_len); entry = estrndup(filename, filename_length); /* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */ - entry_len = (int) filename_length; + entry_len = filename_length; phar = PHAR_G(last_phar); goto splitted; } @@ -644,7 +644,7 @@ static void phar_file_stat(const char *filename, php_stat_len filename_length, i efree(entry); entry = estrndup(filename, filename_length); /* fopen within phar, if :// is not in the url, then prepend phar://<archive>/ */ - entry_len = (int) filename_length; + entry_len = filename_length; if (FAILURE == phar_get_archive(&phar, arch, arch_len, NULL, 0, NULL TSRMLS_CC)) { efree(arch); efree(entry); diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 2762156..2940074 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -988,7 +988,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, zend_str_size_int fn /* tmp_len = 0 says alias length is 0, which means the alias is not stored in the phar */ if (tmp_len) { /* if the alias is stored we enforce it (implicit overrides explicit) */ - if (alias && alias_len && (alias_len != (int)tmp_len || strncmp(alias, buffer, tmp_len))) + if (alias && alias_len && (alias_len != tmp_len || strncmp(alias, buffer, tmp_len))) { buffer[tmp_len] = '\0'; php_stream_close(fp); @@ -1089,7 +1089,7 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, zend_str_size_int fn PHAR_GET_32(buffer, entry.uncompressed_filesize); PHAR_GET_32(buffer, entry.timestamp); - if (offset == halt_offset + (int)manifest_len + 4) { + if (offset == halt_offset + manifest_len + 4) { mydata->min_timestamp = entry.timestamp; mydata->max_timestamp = entry.timestamp; } else { @@ -1530,7 +1530,7 @@ int phar_open_from_filename(char *fname, zend_str_size_int fname_len, char *alia static inline char *phar_strnstr(const char *buf, zend_str_size_int buf_len, const char *search, zend_str_size_int search_len) /* {{{ */ { const char *c; - int so_far = 0; + ptrdiff_t so_far = 0; if (buf_len < search_len) { return NULL; @@ -2540,7 +2540,8 @@ int phar_flush(phar_archive_data *phar, char *user_stub, php_int_t len, int conv char halt_stub[] = "__HALT_COMPILER();"; char *newstub, *tmp; phar_entry_info *entry, *newentry; - int halt_offset, restore_alias_len, global_flags = 0, closeoldfile; + zend_str_size_int halt_offset, restore_alias_len; + int global_flags = 0, closeoldfile; char *pos, has_dirs = 0; char manifest[18], entry_buffer[24]; zend_off_t manifest_ftell; diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h index 36542b9..1a8bd1d 100644 --- a/ext/phar/phar_internal.h +++ b/ext/phar/phar_internal.h @@ -567,7 +567,7 @@ char *phar_compress_filter(phar_entry_info * entry, int return_unknown); void phar_remove_virtual_dirs(phar_archive_data *phar, char *filename, zend_str_size_int filename_len TSRMLS_DC); void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, zend_str_size_int filename_len TSRMLS_DC); int phar_mount_entry(phar_archive_data *phar, char *filename, zend_str_size_int filename_len, char *path, zend_str_size_int path_len TSRMLS_DC); -char *phar_find_in_include_path(char *file, int file_len, phar_archive_data **pphar TSRMLS_DC); +char *phar_find_in_include_path(char *file, zend_str_size_int file_len, phar_archive_data **pphar TSRMLS_DC); char *phar_fix_filepath(char *path, zend_str_size_int *new_len, int use_cwd TSRMLS_DC); phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry, char **error TSRMLS_DC); int phar_parse_metadata(char **buffer, zval **metadata, zend_str_size_int zip_metadata_len TSRMLS_DC); diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index a3b0355..aac24a6 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -169,7 +169,7 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char zend_syntax_highlighter_ini syntax_highlighter_ini; sapi_header_line ctr = {0}; size_t got; - int dummy = 1; + php_int_t dummy = 1; zend_str_size_int name_len; zend_file_handle file_handle; zend_op_array *new_op_array; @@ -259,7 +259,7 @@ static int phar_file_action(phar_archive_data *phar, phar_entry_info *info, char PHAR_G(cwd) = NULL; PHAR_G(cwd_len) = 0; - if (zend_hash_add(&EG(included_files), name, name_len+1, (void *)&dummy, sizeof(int), NULL) == SUCCESS) { + if (zend_hash_add(&EG(included_files), name, name_len+1, (void *)&dummy, sizeof(php_int_t), NULL) == SUCCESS) { if ((cwd = zend_memrchr(entry, '/', entry_len))) { PHAR_G(cwd_init) = 1; if (entry == cwd) { @@ -570,7 +570,8 @@ PHP_METHOD(Phar, webPhar) char *fname, *path_info, *mime_type = NULL, *entry, *pt; const char *basename; zend_str_size_int fname_len, entry_len, index_php_len = 0; - int code, not_cgi, ret, free_pathinfo = 0; + php_int_t code; + int not_cgi, ret, free_pathinfo = 0; phar_archive_data *phar = NULL; phar_entry_info *info = NULL; diff --git a/ext/phar/stream.c b/ext/phar/stream.c index 842f5e9..6a2bb6c 100644 --- a/ext/phar/stream.c +++ b/ext/phar/stream.c @@ -165,7 +165,7 @@ static php_stream * phar_wrapper_open_url(php_stream_wrapper *wrapper, const cha php_url *resource = NULL; php_stream *fpf; zval **pzoption, *metadata; - uint host_len; + zend_str_size_uint host_len; if ((resource = phar_parse_url(wrapper, path, mode, options TSRMLS_CC)) == NULL) { return NULL; diff --git a/ext/phar/tar.c b/ext/phar/tar.c index ef33f2a..4daf7c3 100644 --- a/ext/phar/tar.c +++ b/ext/phar/tar.c @@ -957,7 +957,7 @@ int phar_tar_flush(phar_archive_data *phar, char *user_stub, php_int_t len, int spprintf(error, 0, "phar error: unable to create temporary file"); return -1; } - if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) { + if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) { if (error) { spprintf(error, 0, "unable to set alias in tar-based phar \"%s\"", phar->fname); } @@ -1203,7 +1203,7 @@ nostub: PHAR_SET_32(sigbuf, phar->sig_flags); PHAR_SET_32(sigbuf + 4, signature_length); - if (8 != (int)php_stream_write(entry.fp, sigbuf, 8) || signature_length != (int)php_stream_write(entry.fp, signature, signature_length)) { + if (8 != (int)php_stream_write(entry.fp, sigbuf, 8) || signature_length != php_stream_write(entry.fp, signature, signature_length)) { efree(signature); if (error) { spprintf(error, 0, "phar error: unable to write signature to tar-based phar %s", phar->fname); diff --git a/ext/phar/util.c b/ext/phar/util.c index 90f8695..5652a50 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1399,7 +1399,7 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature /* }}} */ #ifndef PHAR_HAVE_OPENSSL -static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, zend_str_size_int key_len, char **signature, int *signature_len TSRMLS_DC) /* {{{ */ +static int phar_call_openssl_signverify(int is_sign, php_stream *fp, zend_off_t end, char *key, zend_str_size_int key_len, char **signature, zend_str_size_int *signature_len TSRMLS_DC) /* {{{ */ { zend_fcall_info fci; zend_fcall_info_cache fcc; @@ -1528,7 +1528,7 @@ int phar_verify_signature(php_stream *fp, size_t end_of_phar, php_uint32 sig_typ EVP_MD *mdtype = (EVP_MD *) EVP_sha1(); EVP_MD_CTX md_ctx; #else - int tempsig; + zend_str_size_int tempsig; #endif php_uint32 pubkey_len; char *pubkey = NULL, *pfile; diff --git a/ext/phar/zip.c b/ext/phar/zip.c index f910e13..dfef6aa 100644 --- a/ext/phar/zip.c +++ b/ext/phar/zip.c @@ -1125,7 +1125,7 @@ static int phar_zip_applysignature(phar_archive_data *phar, struct _phar_zip_pas PHAR_SET_32(sigbuf, phar->sig_flags); PHAR_SET_32(sigbuf + 4, signature_length); - if (8 != (int)php_stream_write(entry.fp, sigbuf, 8) || signature_length != (int)php_stream_write(entry.fp, signature, signature_length)) { + if (8 != (int)php_stream_write(entry.fp, sigbuf, 8) || signature_length != php_stream_write(entry.fp, signature, signature_length)) { efree(signature); if (pass->error) { spprintf(pass->error, 0, "phar error: unable to write signature to zip-based phar %s", phar->fname); @@ -1195,7 +1195,7 @@ int phar_zip_flush(phar_archive_data *phar, char *user_stub, php_int_t len, int spprintf(error, 0, "phar error: unable to create temporary file"); return EOF; } - if (phar->alias_len != (int)php_stream_write(entry.fp, phar->alias, phar->alias_len)) { + if (phar->alias_len != php_stream_write(entry.fp, phar->alias, phar->alias_len)) { if (error) { spprintf(error, 0, "unable to set alias in zip-based phar \"%s\"", phar->fname); }