Skip to content

Commit 1b1c4ad

Browse files
authored
ext/phar: refactor Phar::loadPhar() to use a zend_string* (php#21837)
1 parent d56253c commit 1b1c4ad

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

ext/phar/phar_object.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -967,16 +967,17 @@ PHP_METHOD(Phar, mapPhar)
967967
/* {{{ Loads any phar archive with an alias */
968968
PHP_METHOD(Phar, loadPhar)
969969
{
970-
char *fname, *alias = NULL, *error;
971-
size_t fname_len, alias_len = 0;
970+
zend_string *fname;
971+
char *alias = NULL, *error;
972+
size_t alias_len = 0;
972973

973-
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|s!", &fname, &fname_len, &alias, &alias_len) == FAILURE) {
974+
if (zend_parse_parameters(ZEND_NUM_ARGS(), "P|s!", &fname, &alias, &alias_len) == FAILURE) {
974975
RETURN_THROWS();
975976
}
976977

977978
phar_request_initialize();
978979

979-
RETVAL_BOOL(phar_open_from_filename(fname, fname_len, alias, alias_len, REPORT_ERRORS, NULL, &error) == SUCCESS);
980+
RETVAL_BOOL(phar_open_from_filename(ZSTR_VAL(fname), ZSTR_LEN(fname), alias, alias_len, REPORT_ERRORS, NULL, &error) == SUCCESS);
980981

981982
if (error) {
982983
zend_throw_exception_ex(phar_ce_PharException, 0, "%s", error);

0 commit comments

Comments
 (0)