Skip to content

Commit e78fc33

Browse files
author
Andi Gutmans
committed
* Fix Zend version
* Fix a method call bug
1 parent 5fdd456 commit e78fc33

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Zend/zend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#ifndef _ZEND_H
2222
#define _ZEND_H
2323

24-
#define ZEND_VERSION "0.80A"
24+
#define ZEND_VERSION "0.90"
2525

2626

2727
#ifdef __cplusplus

Zend/zend_execute.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,7 +1294,8 @@ binary_assign_op_addr: {
12941294
object_ptr = get_zval_ptr_ptr(&opline->op1, Ts, BP_VAR_R);
12951295

12961296

1297-
if (!object_ptr || (*object_ptr)->value.obj.ce->handle_function_call) { /* overloaded function call */
1297+
if (!object_ptr
1298+
|| ((*object_ptr)->type==IS_OBJECT && (*object_ptr)->value.obj.ce->handle_function_call)) { /* overloaded function call */
12981299
zend_overloaded_element overloaded_element;
12991300
zend_property_reference *property_reference;
13001301

@@ -1304,10 +1305,6 @@ binary_assign_op_addr: {
13041305
if (object_ptr) {
13051306
zend_property_reference property_reference;
13061307

1307-
if ((*object_ptr)->type != IS_OBJECT) {
1308-
zend_error(E_ERROR, "Call to a member function on a non-object");
1309-
}
1310-
13111308
property_reference.object = object_ptr;
13121309
property_reference.type = BP_VAR_NA;
13131310
zend_llist_init(&property_reference.elements_list, sizeof(zend_overloaded_element), NULL, 0);

Zend/zend_extensions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ ZEND_API int zend_get_resource_handle();
8686

8787

8888
#define ZEND_EXTENSION() \
89-
ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.80A", ZTS_V, ZEND_DEBUG_V }
89+
ZEND_EXT_API zend_extension_version_info extension_version_info = { ZEND_EXTENSION_API_NO, "0.90", ZTS_V, ZEND_DEBUG_V }
9090

9191
#define STANDARD_ZEND_EXTENSION_PROPERTIES NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, -1
9292

0 commit comments

Comments
 (0)