Skip to content

Commit 6031497

Browse files
GirgiasGirgias
authored
ext/phar: add const qualifiers (#21779)
This is probably going to be round 1 of a few different iterations of adding const qualifiers after figuring out more of the extension code.
1 parent eb763fb commit 6031497

File tree

6 files changed

+51
-44
lines changed

6 files changed

+51
-44
lines changed

‎ext/phar/phar.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ bool phar_archive_delref(phar_archive_data *phar) /* {{{ */
256256
} else if (!phar->refcount) {
257257
/* invalidate phar cache */
258258
PHAR_G(last_phar) = NULL;
259-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
259+
PHAR_G(last_alias) = NULL;
260+
PHAR_G(last_phar_name) = NULL;
260261

261262
/* This is a new phar that has perhaps had an alias/metadata set, but has never been flushed. */
262263
bool remove_fname_cache = !zend_hash_num_elements(&phar->manifest);
@@ -1263,7 +1264,7 @@ static zend_result phar_parse_pharfile(php_stream *fp, char *fname, size_t fname
12631264
}
12641265

12651266
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
1266-
if (SUCCESS != phar_free_alias(fd_ptr, alias, alias_len)) {
1267+
if (SUCCESS != phar_free_alias(fd_ptr)) {
12671268
signature = NULL;
12681269
fp = NULL;
12691270
MAPPHAR_FAIL("Cannot open archive \"%s\", alias is already in use by existing archive");
@@ -1462,7 +1463,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_create_or_parse_filename(c
14621463
phar_archive_data *fd_ptr;
14631464

14641465
if (alias && NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
1465-
if (SUCCESS != phar_free_alias(fd_ptr, alias, alias_len)) {
1466+
if (SUCCESS != phar_free_alias(fd_ptr)) {
14661467
spprintf(error, 4096, "phar error: phar \"%s\" cannot set alias \"%s\", already in use by another phar archive", mydata->fname, alias);
14671468

14681469
zend_hash_str_del(&(PHAR_G(phar_fname_map)), mydata->fname, fname_len);
@@ -3333,7 +3334,8 @@ void phar_request_initialize(void) /* {{{ */
33333334
if (!PHAR_G(request_init))
33343335
{
33353336
PHAR_G(last_phar) = NULL;
3336-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
3337+
PHAR_G(last_alias) = NULL;
3338+
PHAR_G(last_phar_name) = NULL;
33373339
PHAR_G(has_bz2) = zend_hash_str_exists(&module_registry, "bz2", sizeof("bz2")-1);
33383340
PHAR_G(has_zlib) = zend_hash_str_exists(&module_registry, "zlib", sizeof("zlib")-1);
33393341
PHAR_G(request_init) = 1;

‎ext/phar/phar_internal.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ZEND_BEGIN_MODULE_GLOBALS(phar)
149149
char* last_phar_name;
150150
uint32_t last_phar_name_len;
151151
uint32_t last_alias_len;
152-
char* last_alias;
152+
const char* last_alias;
153153
phar_archive_data* last_phar;
154154
HashTable mime_types;
155155
ZEND_END_MODULE_GLOBALS(phar)
@@ -398,7 +398,7 @@ static inline void phar_set_inode(phar_entry_info *entry) /* {{{ */
398398
}
399399
/* }}} */
400400

401-
static inline bool phar_entry_can_remove(phar_entry_info *entry)
401+
static inline bool phar_entry_can_remove(const phar_entry_info *entry)
402402
{
403403
return entry->fp_refcount == 0 && entry->fileinfo_lock_count == 0;
404404
}
@@ -413,9 +413,9 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
413413
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
414414
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_create_or_parse_filename(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
415415
ZEND_ATTRIBUTE_NONNULL_ARGS(3) zend_result phar_open_executed_filename(char *alias, size_t alias_len, char **error);
416-
zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len);
417-
zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fname_len, char *alias, size_t alias_len, char **error);
418-
zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, char *sig, size_t sig_len, char *fname, char **signature, size_t *signature_len, char **error);
416+
zend_result phar_free_alias(const phar_archive_data *phar);
417+
zend_result phar_get_archive(phar_archive_data **archive, const char *fname, size_t fname_len, const char *alias, size_t alias_len, char **error);
418+
zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, char *sig, size_t sig_len, const char *fname, char **signature, size_t *signature_len, char **error);
419419
ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar, php_stream *fp, char **signature, size_t *signature_length, char **error);
420420

421421
/* utility functions */
@@ -424,8 +424,8 @@ const char *phar_decompress_filter(const phar_entry_info *entry, bool return_unk
424424
const char *phar_compress_filter(const phar_entry_info *entry, bool return_unknown);
425425

426426
/* void phar_remove_virtual_dirs(phar_archive_data *phar, char *filename, size_t filename_len); */
427-
void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, size_t filename_len);
428-
zend_result phar_mount_entry(phar_archive_data *phar, char *filename, size_t filename_len, char *path, size_t path_len);
427+
void phar_add_virtual_dirs(phar_archive_data *phar, const char *filename, size_t filename_len);
428+
zend_result phar_mount_entry(phar_archive_data *phar, const char *filename, size_t filename_len, char *path, size_t path_len);
429429
zend_string *phar_find_in_include_path(zend_string *file, phar_archive_data **pphar);
430430
zend_string* phar_fix_filepath(const char *path, size_t path_length, bool use_cwd);
431431
ZEND_ATTRIBUTE_NONNULL phar_entry_info * phar_open_jit(const phar_archive_data *phar, phar_entry_info *entry, char **error);
@@ -448,12 +448,12 @@ zend_result phar_copy_on_write(phar_archive_data **pphar);
448448

449449
/* tar functions in tar.c */
450450
bool phar_is_tar(const char *buf, const char *fname);
451-
zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error);
451+
zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error);
452452
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_tar(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
453453
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_tar_flush(phar_archive_data *phar, zend_string *user_stub, bool is_default_stub, char **error);
454454

455455
/* zip functions in zip.c */
456-
zend_result phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, char **error);
456+
zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, char **error);
457457
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 7, 8) zend_result phar_open_or_create_zip(char *fname, size_t fname_len, char *alias, size_t alias_len, bool is_data, uint32_t options, phar_archive_data** pphar, char **error);
458458
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_zip_flush(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
459459

@@ -470,7 +470,7 @@ void phar_entry_delref(phar_entry_data *idata);
470470
phar_entry_info *phar_get_entry_info(phar_archive_data *phar, char *path, size_t path_len, char **error, bool security);
471471
phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, size_t path_len, char dir, char **error, bool security);
472472
ZEND_ATTRIBUTE_NONNULL phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security, uint32_t timestamp);
473-
ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
473+
ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, const char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security);
474474
ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_flush_ex(phar_archive_data *archive, zend_string *user_stub, bool is_default_stub, char **error);
475475
ZEND_ATTRIBUTE_NONNULL int phar_flush(phar_archive_data *archive, char **error);
476476
zend_result phar_detect_phar_fname_ext(const char *filename, size_t filename_len, const char **ext_str, size_t *ext_len, int executable, int for_create, bool is_complete);

‎ext/phar/phar_object.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,7 +1313,8 @@ PHP_METHOD(Phar, unlinkArchive)
13131313

13141314
/* invalidate phar cache */
13151315
PHAR_G(last_phar) = NULL;
1316-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
1316+
PHAR_G(last_alias) = NULL;
1317+
PHAR_G(last_phar_name) = NULL;
13171318

13181319
phar_archive_delref(phar);
13191320
unlink(fname);
@@ -2216,7 +2217,8 @@ static zend_object *phar_convert_to_other(phar_archive_data *source, int convert
22162217

22172218
/* invalidate phar cache */
22182219
PHAR_G(last_phar) = NULL;
2219-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
2220+
PHAR_G(last_alias) = NULL;
2221+
PHAR_G(last_phar_name) = NULL;
22202222

22212223
php_stream *tmp_fp = php_stream_fopen_tmpfile();
22222224
if (tmp_fp == NULL) {
@@ -2688,7 +2690,8 @@ PHP_METHOD(Phar, setAlias)
26882690

26892691
/* invalidate phar cache */
26902692
PHAR_G(last_phar) = NULL;
2691-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
2693+
PHAR_G(last_alias) = NULL;
2694+
PHAR_G(last_phar_name) = NULL;
26922695

26932696
if (phar_obj->archive->is_data) {
26942697
if (phar_obj->archive->is_tar) {
@@ -2705,7 +2708,7 @@ PHP_METHOD(Phar, setAlias)
27052708
RETURN_TRUE;
27062709
}
27072710
if (NULL != (fd_ptr = zend_hash_find_ptr(&(PHAR_G(phar_alias_map)), new_alias))) {
2708-
if (SUCCESS != phar_free_alias(fd_ptr, ZSTR_VAL(new_alias), ZSTR_LEN(new_alias))) {
2711+
if (SUCCESS != phar_free_alias(fd_ptr)) {
27092712
zend_throw_exception_ex(phar_ce_PharException, 0, "alias \"%s\" is already used for archive \"%s\" and cannot be used for other archives", ZSTR_VAL(new_alias), fd_ptr->fname);
27102713
RETURN_THROWS();
27112714
}

‎ext/phar/tar.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static zend_result phar_tar_process_metadata(phar_entry_info *entry, php_stream
197197
}
198198
/* }}} */
199199

200-
zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error) /* {{{ */
200+
zend_result phar_parse_tarfile(php_stream* fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, uint32_t compression, char **error) /* {{{ */
201201
{
202202
char buf[512], *actual_alias = NULL, *p;
203203
phar_entry_info entry = {0};
@@ -663,7 +663,7 @@ zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, ch
663663
myphar->is_temporary_alias = 0;
664664

665665
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), actual_alias, myphar->alias_len))) {
666-
if (SUCCESS != phar_free_alias(fd_ptr, actual_alias, myphar->alias_len)) {
666+
if (SUCCESS != phar_free_alias(fd_ptr)) {
667667
if (error) {
668668
spprintf(error, 4096, "phar error: Unable to add tar-based phar \"%s\", alias is already in use", fname);
669669
}
@@ -678,7 +678,7 @@ zend_result phar_parse_tarfile(php_stream* fp, char *fname, size_t fname_len, ch
678678

679679
if (alias_len) {
680680
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
681-
if (SUCCESS != phar_free_alias(fd_ptr, alias, alias_len)) {
681+
if (SUCCESS != phar_free_alias(fd_ptr)) {
682682
if (error) {
683683
spprintf(error, 4096, "phar error: Unable to add tar-based phar \"%s\", alias is already in use", fname);
684684
}

‎ext/phar/util.c‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <openssl/ssl.h>
3535
#include <openssl/pkcs12.h>
3636
#else
37-
static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type);
37+
static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, zend_off_t end, const char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type);
3838
#endif
3939

4040
/* for links to relative location, prepend cwd of the entry */
@@ -188,7 +188,7 @@ int phar_seek_efp(phar_entry_info *entry, zend_off_t offset, int whence, zend_of
188188
/* }}} */
189189

190190
/* mount an absolute path or uri to a path internal to the phar archive */
191-
zend_result phar_mount_entry(phar_archive_data *phar, char *filename, size_t filename_len, char *path, size_t path_len) /* {{{ */
191+
zend_result phar_mount_entry(phar_archive_data *phar, const char *filename, size_t filename_len, char *path, size_t path_len) /* {{{ */
192192
{
193193
phar_entry_info entry = {0};
194194
php_stream_statbuf ssb;
@@ -462,7 +462,7 @@ ZEND_ATTRIBUTE_NONNULL static zend_result phar_separate_entry_fp(phar_entry_info
462462
* appended, truncated, or read. For read, if the entry is marked unmodified, it is
463463
* assumed that the file pointer, if present, is opened for reading
464464
*/
465-
ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
465+
ZEND_ATTRIBUTE_NONNULL zend_result phar_get_entry_data(phar_entry_data **ret, const char *fname, size_t fname_len, char *path, size_t path_len, const char *mode, char allow_dir, char **error, bool security) /* {{{ */
466466
{
467467
phar_archive_data *phar;
468468
phar_entry_info *entry;
@@ -929,7 +929,7 @@ ZEND_ATTRIBUTE_NONNULL phar_entry_info * phar_open_jit(const phar_archive_data *
929929
}
930930
/* }}} */
931931

932-
zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len) /* {{{ */
932+
zend_result phar_free_alias(const phar_archive_data *phar) /* {{{ */
933933
{
934934
if (phar->refcount || phar->is_persistent) {
935935
return FAILURE;
@@ -942,7 +942,8 @@ zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_l
942942

943943
/* invalidate phar cache */
944944
PHAR_G(last_phar) = NULL;
945-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
945+
PHAR_G(last_alias) = NULL;
946+
PHAR_G(last_phar_name) = NULL;
946947

947948
return SUCCESS;
948949
}
@@ -952,11 +953,10 @@ zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_l
952953
* Looks up a phar archive in the filename map, connecting it to the alias
953954
* (if any) or returns null
954955
*/
955-
zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fname_len, char *alias, size_t alias_len, char **error) /* {{{ */
956+
zend_result phar_get_archive(phar_archive_data **archive, const char *fname, size_t fname_len, const char *alias, size_t alias_len, char **error) /* {{{ */
956957
{
957958
phar_archive_data *fd, *fd_ptr;
958-
char *my_realpath, *save;
959-
size_t save_len;
959+
char *my_realpath;
960960

961961
phar_request_initialize();
962962

@@ -1003,7 +1003,7 @@ zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fn
10031003
if (error) {
10041004
spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, fd_ptr->fname, fname);
10051005
}
1006-
if (SUCCESS == phar_free_alias(fd_ptr, alias, alias_len)) {
1006+
if (SUCCESS == phar_free_alias(fd_ptr)) {
10071007
if (error) {
10081008
efree(*error);
10091009
*error = NULL;
@@ -1029,8 +1029,8 @@ zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fn
10291029
}
10301030

10311031
my_realpath = NULL;
1032-
save = fname;
1033-
save_len = fname_len;
1032+
const char *save = fname;
1033+
size_t save_len = fname_len;
10341034

10351035
if (fname && fname_len) {
10361036
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_fname_map)), fname, fname_len))) {
@@ -1113,14 +1113,15 @@ zend_result phar_get_archive(phar_archive_data **archive, char *fname, size_t fn
11131113
my_realpath = expand_filepath(fname, my_realpath);
11141114

11151115
if (my_realpath) {
1116-
fname_len = strlen(my_realpath);
1116+
size_t my_realpath_len = strlen(my_realpath);
1117+
#ifdef PHP_WIN32
1118+
phar_unixify_path_separators(my_realpath, my_realpath_len);
1119+
#endif
1120+
fname_len = my_realpath_len;
11171121
fname = my_realpath;
11181122
} else {
11191123
return FAILURE;
11201124
}
1121-
#ifdef PHP_WIN32
1122-
phar_unixify_path_separators(fname, fname_len);
1123-
#endif
11241125

11251126
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_fname_map)), fname, fname_len))) {
11261127
realpath_success:
@@ -1382,7 +1383,7 @@ static int phar_hex_str(const char *digest, size_t digest_len, char **signature)
13821383
/* }}} */
13831384

13841385
#ifndef PHAR_HAVE_OPENSSL
1385-
static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, zend_off_t end, char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type) /* {{{ */
1386+
static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, zend_off_t end, const char *key, size_t key_len, char **signature, size_t *signature_len, uint32_t sig_type) /* {{{ */
13861387
{
13871388
zval retval, zp[4];
13881389
zend_string *str;
@@ -1473,7 +1474,7 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze
14731474
/* }}} */
14741475
#endif /* #ifndef PHAR_HAVE_OPENSSL */
14751476

1476-
zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, char *sig, size_t sig_len, char *fname, char **signature, size_t *signature_len, char **error) /* {{{ */
1477+
zend_result phar_verify_signature(php_stream *fp, size_t end_of_phar, uint32_t sig_type, char *sig, size_t sig_len, const char *fname, char **signature, size_t *signature_len, char **error) /* {{{ */
14771478
{
14781479
size_t read_size, len;
14791480
zend_off_t read_len;
@@ -1959,7 +1960,7 @@ ZEND_ATTRIBUTE_NONNULL zend_result phar_create_signature(phar_archive_data *phar
19591960
/* }}} */
19601961

19611962
// TODO: convert this to zend_string too
1962-
void phar_add_virtual_dirs(phar_archive_data *phar, char *filename, size_t filename_len) /* {{{ */
1963+
void phar_add_virtual_dirs(phar_archive_data *phar, const char *filename, size_t filename_len) /* {{{ */
19631964
{
19641965
const char *s;
19651966
zend_string *str;
@@ -2074,7 +2075,8 @@ zend_result phar_copy_on_write(phar_archive_data **pphar) /* {{{ */
20742075
newpphar = Z_PTR_P(pzv);
20752076
/* invalidate phar cache */
20762077
PHAR_G(last_phar) = NULL;
2077-
PHAR_G(last_phar_name) = PHAR_G(last_alias) = NULL;
2078+
PHAR_G(last_alias) = NULL;
2079+
PHAR_G(last_phar_name) = NULL;
20782080

20792081
if (newpphar->alias_len && NULL == zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), newpphar->alias, newpphar->alias_len, newpphar)) {
20802082
zend_hash_str_del(&(PHAR_G(phar_fname_map)), (*pphar)->fname, (*pphar)->fname_len);

‎ext/phar/zip.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static char *phar_find_eocd(const char *s, size_t n)
224224
* This is used by phar_open_from_fp to process a zip-based phar, but can be called
225225
* directly.
226226
*/
227-
zend_result phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, char *alias, size_t alias_len, phar_archive_data** pphar, char **error) /* {{{ */
227+
zend_result phar_parse_zipfile(php_stream *fp, const char *fname, size_t fname_len, const char *alias, size_t alias_len, phar_archive_data** pphar, char **error) /* {{{ */
228228
{
229229
phar_zip_dir_end locator;
230230
char buf[sizeof(locator) + 65536];
@@ -740,7 +740,7 @@ zend_result phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, ch
740740
mydata->is_temporary_alias = 0;
741741

742742
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), actual_alias, mydata->alias_len))) {
743-
if (SUCCESS != phar_free_alias(fd_ptr, actual_alias, mydata->alias_len)) {
743+
if (SUCCESS != phar_free_alias(fd_ptr)) {
744744
if (error) {
745745
spprintf(error, 4096, "phar error: Unable to add zip-based phar \"%s\" with implicit alias, alias is already in use", fname);
746746
}
@@ -762,7 +762,7 @@ zend_result phar_parse_zipfile(php_stream *fp, char *fname, size_t fname_len, ch
762762

763763
if (alias_len) {
764764
if (NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
765-
if (SUCCESS != phar_free_alias(fd_ptr, alias, alias_len)) {
765+
if (SUCCESS != phar_free_alias(fd_ptr)) {
766766
if (error) {
767767
spprintf(error, 4096, "phar error: Unable to add zip-based phar \"%s\" with explicit alias, alias is already in use", fname);
768768
}
@@ -1279,7 +1279,7 @@ ZEND_ATTRIBUTE_NONNULL_ARGS(1, 4) int phar_zip_flush(phar_archive_data *phar, ze
12791279

12801280
/* set stub */
12811281
if (user_stub && !is_default_stub) {
1282-
char *pos = php_stristr(ZSTR_VAL(user_stub), halt_stub, ZSTR_LEN(user_stub), strlen(halt_stub));
1282+
const char *pos = php_stristr(ZSTR_VAL(user_stub), halt_stub, ZSTR_LEN(user_stub), strlen(halt_stub));
12831283

12841284
if (pos == NULL) {
12851285
spprintf(error, 0, "illegal stub for zip-based phar \"%s\"", phar->fname);

0 commit comments

Comments
 (0)