Try to figure out how to free arguments

Author: Girgias

Zend/zend_vm_def.h

@@ -7981,6 +7981,73 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
 	if (!is_in_silence_live_range(EX(func)->op_array, throw_op_num)
 			|| !instanceof_function(zend_ce_exception, EG(exception)->ce)) {
 		cleanup_unfinished_calls(execute_data, throw_op_num);
+	} else if (UNEXPECTED(EX(call))) {
+		zend_execute_data *call = EX(call);
+		zend_op *opline = EX(func)->op_array.opcodes + throw_op_num;
+		bool do_exit = false;
+		unsigned int level = 0;
+
+		printf("Opcode %d\n", opline->opcode);
+		/* Decrement opline */
+		opline--;
+
+			do {
+				switch (opline->opcode) {
+					case ZEND_DO_FCALL:
+					case ZEND_DO_ICALL:
+					case ZEND_DO_UCALL:
+					case ZEND_DO_FCALL_BY_NAME:
+						level++;
+						break;
+					case ZEND_INIT_FCALL:
+					case ZEND_INIT_FCALL_BY_NAME:
+					case ZEND_INIT_NS_FCALL_BY_NAME:
+					case ZEND_INIT_DYNAMIC_CALL:
+					case ZEND_INIT_USER_CALL:
+					case ZEND_INIT_METHOD_CALL:
+					case ZEND_INIT_STATIC_METHOD_CALL:
+					case ZEND_NEW:
+						if (level == 0) {
+							ZEND_CALL_NUM_ARGS(call) = 0;
+							do_exit = true;
+						}
+						level--;
+						break;
+					case ZEND_SEND_VAL:
+					case ZEND_SEND_VAL_EX:
+					case ZEND_SEND_VAR:
+					case ZEND_SEND_VAR_EX:
+					case ZEND_SEND_FUNC_ARG:
+					case ZEND_SEND_REF:
+					case ZEND_SEND_VAR_NO_REF:
+					case ZEND_SEND_VAR_NO_REF_EX:
+					case ZEND_SEND_USER:
+						if (level == 0) {
+							/* For named args, the number of arguments is up to date. */
+							if (opline->op2_type != IS_CONST) {
+								ZEND_CALL_NUM_ARGS(call) = opline->op2.num;
+							}
+							do_exit = true;
+						}
+						break;
+					case ZEND_SEND_ARRAY:
+					case ZEND_SEND_UNPACK:
+					case ZEND_CHECK_UNDEF_ARGS:
+						if (level == 0) {
+							do_exit = true;
+						}
+						break;
+				}
+				if (!do_exit) {
+					opline--;
+				}
+			} while (!do_exit);
+
+		//zend_vm_stack_free_args(call);
+		//zend_vm_stack_free_extra_args(call);
+		//EX(call) = call->prev_execute_data;
+		//zend_vm_stack_free_call_frame(call);
+		//call = EX(call);
 	}
 
 	if (throw_op->result_type & (IS_VAR | IS_TMP_VAR)) {