cvs: ZendEngine2 / zend_execute_API.c zend_reflection_api.c

dmitry Mon Dec 15 02:17:28 2003 EDT Modified files: /ZendEngine2 zend_reflection_api.c zend_execute_API.c Log: Memory corruptions were fixed in zend_str_tolower_copy() Index: ZendEngine2/zend_reflection_api.c diff -u ZendEngine2/zend_reflection_api.c:1.76 ZendEngine2/zend_reflection_api.c:1.77 --- ZendEngine2/zend_reflection_api.c:1.76 Mon Nov 24 13:13:29 2003 +++ ZendEngine2/zend_reflection_api.c Mon Dec 15 02:17:27 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_reflection_api.c,v 1.76 2003/11/24 18:13:29 andi Exp $ */ +/* $Id: zend_reflection_api.c,v 1.77 2003/12/15 07:17:27 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" #include "zend_default_classes.h" @@ -999,7 +999,7 @@ ZVAL_STRINGL(name, name_str, name_len, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL); lcname = do_alloca(name_len + 1); - zend_str_tolower_copy(lcname, name_str, name_len+1); + zend_str_tolower_copy(lcname, name_str, name_len); if (zend_hash_find(EG(function_table), lcname, name_len + 1, (void **)&fptr) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -1278,7 +1278,7 @@ convert_to_string_ex(&reference); lcname = do_alloca(Z_STRLEN_P(reference) + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_P(reference), Z_STRLEN_P(reference) + 1); + zend_str_tolower_copy(lcname, Z_STRVAL_P(reference), Z_STRLEN_P(reference)); if (zend_hash_find(EG(function_table), lcname, (int) Z_STRLEN_P(reference) + 1, (void**) &fptr) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -1307,7 +1307,7 @@ } else { convert_to_string_ex(classref); lcname = do_alloca(Z_STRLEN_PP(classref) + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_PP(classref), Z_STRLEN_PP(classref) + 1); + zend_str_tolower_copy(lcname, Z_STRVAL_PP(classref), Z_STRLEN_PP(classref)); if (zend_hash_find(EG(class_table), lcname, (int) Z_STRLEN_PP(classref) + 1, (void **) &pce) == FAILURE) { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Class %s does not exist", Z_STRVAL_PP(classref)); @@ -1320,7 +1320,7 @@ convert_to_string_ex(method); lcname = do_alloca(Z_STRLEN_PP(method) + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_PP(method), Z_STRLEN_PP(method) + 1); + zend_str_tolower_copy(lcname, Z_STRVAL_PP(method), Z_STRLEN_PP(method)); if (zend_hash_find(&ce->function_table, lcname, (int)(Z_STRLEN_PP(method) + 1), (void **) &fptr) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -1492,7 +1492,7 @@ case IS_STRING: convert_to_string_ex(&classname); lcname = do_alloca(name_len + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_P(classname), Z_STRLEN_P(classname) + 1); + zend_str_tolower_copy(lcname, Z_STRVAL_P(classname), Z_STRLEN_P(classname)); if (zend_hash_find(EG(class_table), lcname, (int)(Z_STRLEN_P(classname) + 1), (void **) &pce) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -1520,7 +1520,7 @@ ZVAL_STRINGL(name, name_str, name_len, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL); lcname = do_alloca(name_len + 1); - zend_str_tolower_copy(lcname, name_str, name_len+1); + zend_str_tolower_copy(lcname, name_str, name_len); if (zend_hash_find(&ce->function_table, lcname, name_len + 1, (void **) &mptr) == FAILURE) { free_alloca(lcname); @@ -1800,7 +1800,7 @@ zval_add_ref(&argument); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &argument, sizeof(zval *), NULL); lcname = do_alloca(Z_STRLEN_P(argument) + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_P(argument), Z_STRLEN_P(argument)+1); + zend_str_tolower_copy(lcname, Z_STRVAL_P(argument), Z_STRLEN_P(argument)); if (zend_hash_find(EG(class_table), lcname, (int)(Z_STRLEN_P(argument) + 1), (void **)&ce) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -2543,7 +2543,7 @@ case IS_STRING: convert_to_string_ex(&classname); lcname = do_alloca(Z_STRLEN_P(classname) + 1); - zend_str_tolower_copy(lcname, Z_STRVAL_P(classname), Z_STRLEN_P(classname) + 1); + zend_str_tolower_copy(lcname, Z_STRVAL_P(classname), Z_STRLEN_P(classname)); if (zend_hash_find(EG(class_table), lcname, (int)(Z_STRLEN_P(classname) + 1), (void **) &pce) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, @@ -2564,7 +2564,7 @@ } lcname = do_alloca(name_len + 1); - zend_str_tolower_copy(lcname, name_str, name_len + 1); + zend_str_tolower_copy(lcname, name_str, name_len); if (zend_hash_find(&ce->properties_info, lcname, name_len + 1, (void **) &property_info) == FAILURE) { free_alloca(lcname); @@ -2825,7 +2825,7 @@ ZVAL_STRINGL(name, name_str, name_len, 1); zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &name, sizeof(zval *), NULL); lcname = do_alloca(name_len + 1); - zend_str_tolower_copy(lcname, name_str, name_len+1); + zend_str_tolower_copy(lcname, name_str, name_len); if (zend_hash_find(&module_registry, lcname, (int)(Z_STRLEN_P(name) + 1), (void **)&module) == FAILURE) { free_alloca(lcname); zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.243 ZendEngine2/zend_execute_API.c:1.244 --- ZendEngine2/zend_execute_API.c:1.243 Thu Dec 11 13:18:52 2003 +++ ZendEngine2/zend_execute_API.c Mon Dec 15 02:17:27 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.243 2003/12/11 18:18:52 helly Exp $ */ +/* $Id: zend_execute_API.c,v 1.244 2003/12/15 07:17:27 dmitry Exp $ */ #include <stdio.h> #include <signal.h> @@ -784,7 +784,7 @@ zval *exception; lc_name = do_alloca(name_length + 1); - zend_str_tolower_copy(lc_name, name, name_length+1); + zend_str_tolower_copy(lc_name, name, name_length); if (zend_hash_find(EG(class_table), lc_name, name_length+1, (void **) ce) == SUCCESS) { free_alloca(lc_name);