Fix destination

Author: kocsismate

Zend/zend_API.h

@@ -1397,19 +1397,19 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
 #define Z_PARAM_CLASS(dest) \
 	Z_PARAM_CLASS_EX(dest, 0, 0)
 
-#define Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, allow_null) \
+#define Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, allow_null) \
 	Z_PARAM_PROLOGUE(0, 0); \
-	if (UNEXPECTED(!zend_parse_arg_class_name_or_obj(_arg, &dest_str, &dest_object, _i, allow_null))) { \
+	if (UNEXPECTED(!zend_parse_arg_class_name_or_obj(_arg, &dest, _i, allow_null))) { \
 		_expected_type = allow_null ? Z_EXPECTED_CLASS_NAME_OR_OBJECT_OR_NULL : Z_EXPECTED_CLASS_NAME_OR_OBJECT; \
 		_error_code = ZPP_ERROR_WRONG_ARG; \
 		break; \
 	}
 
-#define Z_PARAM_CLASS_NAME_OR_OBJ(dest_str, dest_object) \
-	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, 0);
+#define Z_PARAM_CLASS_NAME_OR_OBJ(dest) \
+	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, 0);
 
-#define Z_PARAM_CLASS_NAME_OR_OBJ_OR_NULL(dest_str, dest_object) \
-	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest_str, dest_object, 1);
+#define Z_PARAM_CLASS_NAME_OR_OBJ_OR_NULL(dest) \
+	Z_PARAM_CLASS_NAME_OR_OBJ_EX(dest, 1);
 
 /* old "d" */
 #define Z_PARAM_DOUBLE_EX2(dest, is_null, check_null, deref, separate) \
@@ -1955,22 +1955,18 @@ static zend_always_inline int zend_parse_arg_str_or_long(zval *arg, zend_string
 }
 
 static zend_always_inline int zend_parse_arg_class_name_or_obj(
-	zval *arg, zend_string **dest_str, zend_object **dest_object, int num, int allow_null
+	zval *arg, zend_class_entry **destination, int num, int allow_null
 ) {
-	zend_class_entry *class_entry;
+	if (EXPECTED(Z_TYPE_P(arg) == IS_STRING)) {
+		*destination = zend_lookup_class(Z_STR_P(arg));
 
-	if (EXPECTED(Z_TYPE_P(arg) == IS_STRING) && (class_entry = zend_lookup_class(Z_STR_P(arg)))) {
-		*dest_str = class_entry->name;
-		*dest_object = NULL;
+		return *destination != NULL;
 	} else if (EXPECTED(Z_TYPE_P(arg) == IS_OBJECT)) {
-		*dest_str = NULL;
-		*dest_object = Z_OBJ_P(arg);
+		*destination = Z_OBJ_P(arg)->ce;
 	} else if (allow_null && EXPECTED(Z_TYPE_P(arg) == IS_NULL)) {
-		*dest_str = NULL;
-		*dest_object = NULL;
+		*destination = NULL;
 	} else {
-		*dest_str = NULL;
-		*dest_object = NULL;
+		*destination = NULL;
 		return 0;
 	}
 

Zend/zend_builtin_functions.c

@@ -637,20 +637,14 @@ ZEND_FUNCTION(get_called_class)
    Retrieves the parent class name for object or class or current scope or false if not in a scope. */
 ZEND_FUNCTION(get_parent_class)
 {
-	zend_string *str = NULL;
-	zend_object *object = NULL;
 	zend_class_entry *ce = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 1)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_CLASS_NAME_OR_OBJ(str, object)
+		Z_PARAM_CLASS_NAME_OR_OBJ(ce)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (object) {
-		ce = object->ce;
-	} else if (str) {
-		ce = zend_lookup_class(str);
-	} else {
+	if (!ce) {
 		ce = zend_get_executed_scope();
 	}