diff options
| author | Anatol Belski <ab@php.net> | 2014-08-27 21:53:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-27 21:53:06 +0200 |
| commit | 1e3e9e0bbbe073db4a32627e67e8f5d838852eaf (patch) | |
| tree | 7a145ee953caf16c59bb18f059b9f9c50c1d02bd /ext/phar | |
| parent | bf96ee95cea4793b21abd5462a69fa3945f09fe7 (diff) | |
| download | php-git-1e3e9e0bbbe073db4a32627e67e8f5d838852eaf.tar.gz | |
's' and size_t - fix some invalid pointers and the remaining ext/mcrypt parts
Diffstat (limited to 'ext/phar')
| -rwxr-xr-x | ext/phar/phar_object.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 155252233d..0ce1c3f569 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -455,7 +455,8 @@ PHP_METHOD(Phar, running) PHP_METHOD(Phar, mount) { char *fname, *arch = NULL, *entry = NULL, *path, *actual; - size_t fname_len, arch_len, entry_len, path_len, actual_len; + int fname_len, arch_len, entry_len; + size_t path_len, actual_len; phar_archive_data *pphar; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &path, &path_len, &actual, &actual_len) == FAILURE) { @@ -1138,7 +1139,7 @@ PHP_METHOD(Phar, __construct) } save_fname = fname; - if (SUCCESS == phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, !is_data, 2 TSRMLS_CC)) { + if (SUCCESS == phar_split_fname(fname, (int)fname_len, &arch, &arch_len, &entry, &entry_len, !is_data, 2 TSRMLS_CC)) { /* use arch (the basename for the archive) for fname instead of fname */ /* this allows support for RecursiveDirectoryIterator of subdirectories */ #ifdef PHP_WIN32 @@ -1292,7 +1293,8 @@ PHP_METHOD(Phar, getSupportedCompression) PHP_METHOD(Phar, unlinkArchive) { char *fname, *error, *zname, *arch, *entry; - size_t fname_len, zname_len, arch_len, entry_len; + size_t fname_len; + int zname_len, arch_len, entry_len; phar_archive_data *phar; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &fname, &fname_len) == FAILURE) { @@ -4327,7 +4329,8 @@ all_files: PHP_METHOD(PharFileInfo, __construct) { char *fname, *arch, *entry, *error; - size_t fname_len, arch_len, entry_len; + size_t fname_len; + int arch_len, entry_len; phar_entry_object *entry_obj; phar_entry_info *entry_info; phar_archive_data *phar_data; @@ -4344,7 +4347,7 @@ PHP_METHOD(PharFileInfo, __construct) return; } - if (fname_len < 7 || memcmp(fname, "phar://", 7) || phar_split_fname(fname, fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC) == FAILURE) { + if (fname_len < 7 || memcmp(fname, "phar://", 7) || phar_split_fname(fname, (int)fname_len, &arch, &arch_len, &entry, &entry_len, 2, 0 TSRMLS_CC) == FAILURE) { zend_throw_exception_ex(spl_ce_RuntimeException, 0 TSRMLS_CC, "'%s' is not a valid phar archive URL (must have at least phar://filename.phar)", fname); return; |