archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/phar: Reduce scope of some variables

Browse source
This commit is contained in:
Gina Peter Bnayard 2024-09-12 19:45:51 +02:00 • committed by Gina Peter Banyard
parent 6adffebeb8
commit d486d65962
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ext/phar/phar.c
View file

@ -2546,7 +2546,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
php_stream_filter *filter; php_stream_filter *filter;
php_serialize_data_t metadata_hash; php_serialize_data_t metadata_hash;
smart_str main_metadata_str = {0}; smart_str main_metadata_str = {0};
int free_user_stub, free_fp = 1, free_ufp = 1; int free_fp = 1, free_ufp = 1;
int manifest_hack = 0; int manifest_hack = 0;
php_stream *shared_cfp = NULL; php_stream *shared_cfp = NULL;
@ -2600,6 +2600,8 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
if (user_stub) { if (user_stub) {
zend_string *suser_stub; zend_string *suser_stub;
bool free_user_stub = false;
if (len < 0) { if (len < 0) {
/* resource passed in */ /* resource passed in */
if (!(php_stream_from_zval_no_verify(stubfile, (zval *)user_stub))) { if (!(php_stream_from_zval_no_verify(stubfile, (zval *)user_stub))) {
@ -2629,12 +2631,11 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
} }
return EOF; return EOF;
} }
free_user_stub = 1; free_user_stub = true;
user_stub = ZSTR_VAL(suser_stub); user_stub = ZSTR_VAL(suser_stub);
len = ZSTR_LEN(suser_stub); len = ZSTR_LEN(suser_stub);
} else {
free_user_stub = 0;
} }
if ((pos = php_stristr(user_stub, halt_stub, len, sizeof(halt_stub) - 1)) == NULL) { if ((pos = php_stristr(user_stub, halt_stub, len, sizeof(halt_stub) - 1)) == NULL) {
if (closeoldfile) { if (closeoldfile) {
php_stream_close(oldfile); php_stream_close(oldfile);
@ -3513,8 +3514,6 @@ void phar_request_initialize(void) /* {{{ */
PHP_RSHUTDOWN_FUNCTION(phar) /* {{{ */ PHP_RSHUTDOWN_FUNCTION(phar) /* {{{ */
{ {
uint32_t i;
PHAR_G(request_ends) = 1; PHAR_G(request_ends) = 1;
if (PHAR_G(request_init)) if (PHAR_G(request_init))
@ -3529,7 +3528,7 @@ PHP_RSHUTDOWN_FUNCTION(phar) /* {{{ */
PHAR_G(phar_SERVER_mung_list) = 0; PHAR_G(phar_SERVER_mung_list) = 0;
if (PHAR_G(cached_fp)) { if (PHAR_G(cached_fp)) {
for (i = 0; i < zend_hash_num_elements(&cached_phars); ++i) { for (uint32_t i = 0; i < zend_hash_num_elements(&cached_phars); ++i) {
if (PHAR_G(cached_fp)[i].fp) { if (PHAR_G(cached_fp)[i].fp) {
php_stream_close(PHAR_G(cached_fp)[i].fp); php_stream_close(PHAR_G(cached_fp)[i].fp);
} }