Skip to content

Commit 54787f2

Browse files
GirgiasGirgias
committed
ext/phar/util.c: remove dup fd variable in phar_get_archive()
The naming between fd and fd_ptr seem to indicate one is not a pointer, but they both are. Moreover, there is no reason to copy the same value to the variables at the same time.
1 parent cad713d commit 54787f2

1 file changed

Lines changed: 28 additions & 33 deletions

File tree

‎ext/phar/util.c‎

Lines changed: 28 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ zend_result phar_free_alias(const phar_archive_data *phar) /* {{{ */
962962
*/
963963
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) /* {{{ */
964964
{
965-
phar_archive_data *fd, *fd_ptr;
965+
phar_archive_data *fd_ptr;
966966

967967
phar_request_initialize();
968968

@@ -999,8 +999,7 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
999999
if (alias && alias_len) {
10001000
/* If the alias stored in the last_phar cache matches, just use it directly */
10011001
if (PHAR_G(last_phar) && alias_len == PHAR_G(last_alias_len) && !memcmp(alias, PHAR_G(last_alias), alias_len)) {
1002-
fd = PHAR_G(last_phar);
1003-
fd_ptr = fd;
1002+
fd_ptr = PHAR_G(last_phar);
10041003
} else {
10051004
fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len);
10061005
}
@@ -1025,9 +1024,8 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
10251024
}
10261025

10271026
*archive = fd_ptr;
1028-
fd = fd_ptr;
1029-
PHAR_G(last_phar) = fd;
1030-
PHAR_G(last_phar_name) = fd->fname;
1027+
PHAR_G(last_phar) = fd_ptr;
1028+
PHAR_G(last_phar_name) = fd_ptr->fname;
10311029
PHAR_G(last_alias) = alias;
10321030
PHAR_G(last_alias_len) = alias_len;
10331031

@@ -1039,50 +1037,48 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
10391037
fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_fname_map)), fname, fname_len);
10401038
if (fd_ptr) {
10411039
*archive = fd_ptr;
1042-
fd = fd_ptr;
10431040

10441041
if (alias && alias_len) {
1045-
if (!fd->is_temporary_alias && (alias_len != fd->alias_len || memcmp(fd->alias, alias, alias_len))) {
1042+
if (!fd_ptr->is_temporary_alias && (alias_len != fd_ptr->alias_len || memcmp(fd_ptr->alias, alias, alias_len))) {
10461043
if (error) {
10471044
spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, ZSTR_VAL(fd_ptr->fname), fname);
10481045
}
10491046
return FAILURE;
10501047
}
10511048

1052-
if (fd->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len)) {
1053-
zend_hash_str_del(&(PHAR_G(phar_alias_map)), fd->alias, fd->alias_len);
1049+
if (fd_ptr->alias_len && zend_hash_str_exists(&(PHAR_G(phar_alias_map)), fd_ptr->alias, fd_ptr->alias_len)) {
1050+
zend_hash_str_del(&(PHAR_G(phar_alias_map)), fd_ptr->alias, fd_ptr->alias_len);
10541051
}
10551052

1056-
zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, fd);
1053+
zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, fd_ptr);
10571054
}
10581055

1059-
PHAR_G(last_phar) = fd;
1060-
PHAR_G(last_phar_name) = fd->fname;
1061-
PHAR_G(last_alias) = fd->alias;
1062-
PHAR_G(last_alias_len) = fd->alias_len;
1056+
PHAR_G(last_phar) = fd_ptr;
1057+
PHAR_G(last_phar_name) = fd_ptr->fname;
1058+
PHAR_G(last_alias) = fd_ptr->alias;
1059+
PHAR_G(last_alias_len) = fd_ptr->alias_len;
10631060

10641061
return SUCCESS;
10651062
}
10661063

10671064
if (PHAR_G(manifest_cached) && NULL != (fd_ptr = zend_hash_str_find_ptr(&cached_phars, fname, fname_len))) {
10681065
*archive = fd_ptr;
1069-
fd = fd_ptr;
10701066

10711067
/* this could be problematic - alias should never be different from manifest alias
10721068
for cached phars */
1073-
if (!fd->is_temporary_alias && alias && alias_len) {
1074-
if (alias_len != fd->alias_len || memcmp(fd->alias, alias, alias_len)) {
1069+
if (!fd_ptr->is_temporary_alias && alias && alias_len) {
1070+
if (alias_len != fd_ptr->alias_len || memcmp(fd_ptr->alias, alias, alias_len)) {
10751071
if (error) {
10761072
spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, ZSTR_VAL(fd_ptr->fname), fname);
10771073
}
10781074
return FAILURE;
10791075
}
10801076
}
10811077

1082-
PHAR_G(last_phar) = fd;
1083-
PHAR_G(last_phar_name) = fd->fname;
1084-
PHAR_G(last_alias) = fd->alias;
1085-
PHAR_G(last_alias_len) = fd->alias_len;
1078+
PHAR_G(last_phar) = fd_ptr;
1079+
PHAR_G(last_phar_name) = fd_ptr->fname;
1080+
PHAR_G(last_alias) = fd_ptr->alias;
1081+
PHAR_G(last_alias_len) = fd_ptr->alias_len;
10861082

10871083
return SUCCESS;
10881084
}
@@ -1095,12 +1091,12 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
10951091
}
10961092

10971093
if (fd_ptr) {
1098-
fd = *archive = fd_ptr;
1094+
*archive = fd_ptr;
10991095

1100-
PHAR_G(last_phar) = fd;
1101-
PHAR_G(last_phar_name) = fd->fname;
1102-
PHAR_G(last_alias) = fd->alias;
1103-
PHAR_G(last_alias_len) = fd->alias_len;
1096+
PHAR_G(last_phar) = fd_ptr;
1097+
PHAR_G(last_phar_name) = fd_ptr->fname;
1098+
PHAR_G(last_alias) = fd_ptr->alias;
1099+
PHAR_G(last_alias_len) = fd_ptr->alias_len;
11041100

11051101
return SUCCESS;
11061102
}
@@ -1127,16 +1123,15 @@ zend_result phar_get_archive(phar_archive_data **archive, const char *fname, siz
11271123

11281124
if (fd_ptr) {
11291125
*archive = fd_ptr;
1130-
fd = fd_ptr;
11311126

11321127
if (alias && alias_len) {
1133-
zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, fd);
1128+
zend_hash_str_add_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len, fd_ptr);
11341129
}
11351130

1136-
PHAR_G(last_phar) = fd;
1137-
PHAR_G(last_phar_name) = fd->fname;
1138-
PHAR_G(last_alias) = fd->alias;
1139-
PHAR_G(last_alias_len) = fd->alias_len;
1131+
PHAR_G(last_phar) = fd_ptr;
1132+
PHAR_G(last_phar_name) = fd_ptr->fname;
1133+
PHAR_G(last_alias) = fd_ptr->alias;
1134+
PHAR_G(last_alias_len) = fd_ptr->alias_len;
11401135

11411136
return SUCCESS;
11421137
}

0 commit comments

Comments
 (0)