php.net |  support |  documentation |  report a bug |  advanced search |  search howto |  statistics |  random bug |  login
Return to Bug #55719
Patch bug55719.diff revision 2011-09-18 15:51 UTC by laruence@php.net
revision 2011-09-18 15:15 UTC by laruence@php.net
revision 2011-09-18 15:14 UTC by laruence@php.net
revision 2011-09-18 14:54 UTC by laruence@php.net
Patch argument_restriction_002.phpt revision 2011-09-18 15:32 UTC by laruence@php.net
revision 2011-09-18 15:32 UTC by laruence@php.net
revision 2011-09-18 14:55 UTC by laruence@php.net
Patch argument_restriction_005.phpt revision 2011-09-18 15:11 UTC by laruence@php.net
Patch argument_restriction_004.phpt revision 2011-09-18 15:06 UTC by laruence@php.net
Patch argument_restriction_003.phpt revision 2011-09-18 15:06 UTC by laruence@php.net
Patch argument_restriction_001.phpt revision 2011-09-18 14:54 UTC by laruence@php.net

Patch bug55719.diff for Unknown/Other Function Bug #55719

Patch version 2011-09-18 15:51 UTC

Return to Bug #55719 | Download this patch
Patch Revisions: 2011-09-18 15:51 UTC | 2011-09-18 15:15 UTC | 2011-09-18 15:14 UTC | 2011-09-18 14:54 UTC

Developer: laruence@php.net



  Index: Zend/zend_compile.c
  ===================================================================
  --- Zend/zend_compile.c	(revision 316933)
  +++ Zend/zend_compile.c	(working copy)
 @@ -3010,6 +3010,145 @@
 @@ -3010,6 +3010,171 @@
   }
   /* }}} */
   
 +#define REALLOC_BUF_IF_EXCEED(buf, offset, length, size) \
 +	if (offset - buf + size >= length) { 	\
 +		length += size + 1; 				\
 +		buf = erealloc(buf, length); 		\
 +	}
 +
  +static char * zend_get_function_declaration(zend_function *fptr TSRMLS_CC) /* {{{ */ {
 +	char *offset, *buf = (char *)emalloc(1024 * sizeof(char));
 +	char *offset, *buf;
 +	zend_uint length = 1024;
  +
 +	offset = buf;
 +	offset = buf = (char *)emalloc(length * sizeof(char));
  +	if (fptr->op_array.fn_flags & ZEND_ACC_RETURN_REFERENCE) {
  +		*(offset++) = '&';
  +		*(offset++) = ' ';
 +	}
 +	}
  +
  +	if (fptr->common.scope) {
  +		memcpy(offset, fptr->common.scope->name, fptr->common.scope->name_length);
  +		offset += fptr->common.scope->name_length;
  +		*(offset++) = ':';
 +		*(offset++) = ':';
 +		*(offset++) = ':';
  +	}
  +	
  +	{
  +		size_t name_len = strlen(fptr->common.function_name);
 +		REALLOC_BUF_IF_EXCEED(buf, offset, length, name_len + 1);
  +		memcpy(offset, fptr->common.function_name, name_len);
  +		offset += name_len;
  +	}
  +


  +
  +		required = fptr->common.required_num_args;
  +		for (i = 0; i < fptr->common.num_args;) {
  +			if (arg_info->class_name) {
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, arg_info->class_name_len + 1);
  +				memcpy(offset, arg_info->class_name, arg_info->class_name_len);
  +				offset += arg_info->class_name_len;
  +				*(offset++) = ' ';
  +			} else if (arg_info->type_hint) {
  +				zend_uint type_name_len;
  +				char *type_name = zend_get_type_by_const(arg_info->type_hint);
  +				type_name_len = strlen(type_name);
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, type_name_len + 1);
  +				memcpy(offset, type_name, type_name_len);
  +				offset += type_name_len;
  +				*(offset++) = ' ';
 +			}
 +
 +			}
 +				
 +			REALLOC_BUF_IF_EXCEED(buf, offset, length, 2);
  +			if (arg_info->pass_by_reference) {
  +				*(offset++) = '&';
  +			}
 +
  +			*(offset++) = '$';
 +
  +			if (arg_info->name) {
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, arg_info->name_len);
  +				memcpy(offset, arg_info->name, arg_info->name_len);
  +				offset += arg_info->name_len;
  +			} else {
  +				zend_uint idx = i;
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, 5);
  +				memcpy(offset, "param", 5);
  +				offset += 5;
  +				do {
 +					REALLOC_BUF_IF_EXCEED(buf, offset, length, 1);
  +					*(offset++) = (char) (idx % 10) + '0';
  +					idx /= 10;
  +				} while (idx > 0);
  +			}
  +			if (i >= required) {
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, 3);
  +				*(offset++) = ' ';
  +				*(offset++) = '=';
  +				*(offset++) = ' ';
  +				if (fptr->type == ZEND_USER_FUNCTION) {


  +						INIT_PZVAL(zv);
  +						zval_update_constant_ex(&zv, (void*)1, fptr->common.scope TSRMLS_CC);
  +						if (Z_TYPE_P(zv) == IS_BOOL) {
  +							if (Z_LVAL_P(zv)) {
 +								REALLOC_BUF_IF_EXCEED(buf, offset, length, 4);
  +								memcpy(offset, "true", 4);
  +								offset += 4;
  +							} else {
 +								REALLOC_BUF_IF_EXCEED(buf, offset, length, 5);
  +								memcpy(offset, "false", 5);
  +								offset += 5;
  +							}
  +						} else if (Z_TYPE_P(zv) == IS_NULL) {
 +							REALLOC_BUF_IF_EXCEED(buf, offset, length, 4);
  +							memcpy(offset, "NULL", 4);
  +							offset += 4;
  +						} else if (Z_TYPE_P(zv) == IS_STRING) {
 +							REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), 1));
  +							*(offset++) = '\'';
 +							REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), 10));
  +							memcpy(offset, Z_STRVAL_P(zv), MIN(Z_STRLEN_P(zv), 10));
  +							offset += MIN(Z_STRLEN_P(zv), 10);
  +							if (Z_STRLEN_P(zv) > 10) {
 +								REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), 3));
  +								*(offset++) = '.';
  +								*(offset++) = '.';
  +								*(offset++) = '.';
  +							}
 +							REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), 1));
  +							*(offset++) = '\'';
  +						} else {
  +							zend_make_printable_zval(zv, &zv_copy, &use_copy);
 +							REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), Z_STRLEN_P(zv)));
  +							memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv));
  +							offset += Z_STRLEN_P(zv);
  +							if (use_copy) {
  +								zval_dtor(&zv_copy);


  +						}
  +						zval_ptr_dtor(&zv);
  +					}
  +				} else {
 +					REALLOC_BUF_IF_EXCEED(buf, offset, length, 4);
  +					memcpy(offset, "NULL", 4);
  +					offset += 4;
  +				}
  +			}
  +
  +			if (++i < fptr->common.num_args) {
 +				REALLOC_BUF_IF_EXCEED(buf, offset, length, 2);
  +				*(offset++) = ',';
  +				*(offset++) = ' ';
  +			}
  +			arg_info++;
  +		}
 +		REALLOC_BUF_IF_EXCEED(buf, offset, length, 1);
  +		*(offset++) = ')';
  +	}
  +	*offset = '\0';
  +


  +
   static void do_inheritance_check_on_method(zend_function *child, zend_function *parent TSRMLS_DC)
   {
   	zend_uint child_flags;
 @@ -3069,11 +3208,13 @@
 @@ -3069,11 +3234,13 @@
   
   	if (child->common.prototype && (child->common.prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
   		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
  -			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with that of %s::%s()", ZEND_FN_SCOPE_NAME(child), child->common.function_name, ZEND_FN_SCOPE_NAME(child->common.prototype), child->common.prototype->common.function_name);
 
PHP Copyright © 2001-2024 The PHP Group
All rights reserved.
Last updated: Fri Mar 01 04:01:34 2024 UTC