Skip to content

Use the passed 'this' ptr instead of ZEND_THIS #8854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2022
Merged

Use the passed 'this' ptr instead of ZEND_THIS #8854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89e8e2b
Use the passed 'this' ptr instead of ZEND_THIS
Girgias Jun 23, 2022
bfd9b0a
Remove other usage of ZEND_THIS and the horrible hack usage of defini…
Girgias Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,6 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
return spl_filesystem_file_read_csv(intern, intern->u.file.delimiter, intern->u.file.enclosure, intern->u.file.escape, NULL);
}
if (intern->u.file.func_getCurr->common.scope != spl_ce_SplFileObject) {
zend_execute_data *execute_data = EG(current_execute_data);
spl_filesystem_file_free_line(intern);

if (php_stream_eof(intern->u.file.stream)) {
Expand All @@ -1977,14 +1976,14 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
}
return FAILURE;
}
zend_call_method_with_0_params(Z_OBJ_P(this_ptr), Z_OBJCE_P(ZEND_THIS), &intern->u.file.func_getCurr, "getCurrentLine", &retval);
zend_call_method_with_0_params(Z_OBJ_P(this_ptr), Z_OBJCE_P(this_ptr), &intern->u.file.func_getCurr, "getCurrentLine", &retval);
if (Z_ISUNDEF(retval)) {
return FAILURE;
}

if (Z_TYPE(retval) != IS_STRING) {
zend_type_error("%s::getCurrentLine(): Return value must be of type string, %s returned",
ZSTR_VAL(Z_OBJCE_P(ZEND_THIS)->name), zend_zval_type_name(&retval));
ZSTR_VAL(Z_OBJCE_P(this_ptr)->name), zend_zval_type_name(&retval));
zval_ptr_dtor(&retval);
return FAILURE;
}
Expand Down