cvs: ZendEngine2 / zend_API.c zend_API.h

dmitry Fri Oct 28 09:48:22 2005 EDT Modified files: /ZendEngine2 zend_API.c zend_API.h Log: Fixed bug #34879 (str_replace, array_map corrupt negative array indexes)

http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.323&r2=1.324&ty=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.323 ZendEngine2/zend_API.c:1.324 --- ZendEngine2/zend_API.c:1.323 Thu Oct 27 10:14:33 2005 +++ ZendEngine2/zend_API.c Fri Oct 28 09:48:15 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.323 2005/10/27 14:14:33 iliaa Exp $ */ +/* $Id: zend_API.c,v 1.324 2005/10/28 13:48:15 dmitry Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -1293,7 +1293,7 @@ return zend_u_symtable_update(Z_ARRVAL_P(arg), type, key, key_len, (void *) &value, sizeof(zval *), NULL); } -ZEND_API int add_index_long(zval *arg, uint index, long n) +ZEND_API int add_index_long(zval *arg, ulong index, long n) { zval *tmp; @@ -1304,7 +1304,7 @@ } -ZEND_API int add_index_null(zval *arg, uint index) +ZEND_API int add_index_null(zval *arg, ulong index) { zval *tmp; @@ -1314,7 +1314,7 @@ return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), NULL); } -ZEND_API int add_index_bool(zval *arg, uint index, int b) +ZEND_API int add_index_bool(zval *arg, ulong index, int b) { zval *tmp; @@ -1325,7 +1325,7 @@ } -ZEND_API int add_index_resource(zval *arg, uint index, int r) +ZEND_API int add_index_resource(zval *arg, ulong index, int r) { zval *tmp; @@ -1336,7 +1336,7 @@ } -ZEND_API int add_index_double(zval *arg, uint index, double d) +ZEND_API int add_index_double(zval *arg, ulong index, double d) { zval *tmp; @@ -1347,7 +1347,7 @@ } -ZEND_API int add_index_string(zval *arg, uint index, char *str, int duplicate) +ZEND_API int add_index_string(zval *arg, ulong index, char *str, int duplicate) { zval *tmp; @@ -1358,7 +1358,7 @@ } -ZEND_API int add_index_stringl(zval *arg, uint index, char *str, uint length, int duplicate) +ZEND_API int add_index_stringl(zval *arg, ulong index, char *str, uint length, int duplicate) { zval *tmp; @@ -1369,7 +1369,7 @@ } -ZEND_API int add_index_binary(zval *arg, uint index, char *str, int duplicate TSRMLS_DC) +ZEND_API int add_index_binary(zval *arg, ulong index, char *str, int duplicate TSRMLS_DC) { zval *tmp; @@ -1380,7 +1380,7 @@ } -ZEND_API int add_index_binaryl(zval *arg, uint index, char *str, uint length, int duplicate TSRMLS_DC) +ZEND_API int add_index_binaryl(zval *arg, ulong index, char *str, uint length, int duplicate TSRMLS_DC) { zval *tmp; @@ -1391,7 +1391,7 @@ } -ZEND_API int add_index_unicode(zval *arg, uint index, UChar *str, int duplicate) +ZEND_API int add_index_unicode(zval *arg, ulong index, UChar *str, int duplicate) { zval *tmp; @@ -1402,7 +1402,7 @@ } -ZEND_API int add_index_unicodel(zval *arg, uint index, UChar *str, uint length, int duplicate) +ZEND_API int add_index_unicodel(zval *arg, ulong index, UChar *str, uint length, int duplicate) { zval *tmp; @@ -1413,7 +1413,7 @@ } -ZEND_API int add_index_zval(zval *arg, uint index, zval *value) +ZEND_API int add_index_zval(zval *arg, ulong index, zval *value) { return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &value, sizeof(zval *), NULL); } @@ -1569,7 +1569,7 @@ } -ZEND_API int add_get_index_long(zval *arg, uint index, long l, void **dest) +ZEND_API int add_get_index_long(zval *arg, ulong index, long l, void **dest) { zval *tmp; @@ -1580,7 +1580,7 @@ } -ZEND_API int add_get_index_double(zval *arg, uint index, double d, void **dest) +ZEND_API int add_get_index_double(zval *arg, ulong index, double d, void **dest) { zval *tmp; @@ -1591,7 +1591,7 @@ } -ZEND_API int add_get_index_string(zval *arg, uint index, char *str, void **dest, int duplicate) +ZEND_API int add_get_index_string(zval *arg, ulong index, char *str, void **dest, int duplicate) { zval *tmp; @@ -1602,7 +1602,7 @@ } -ZEND_API int add_get_index_stringl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate) +ZEND_API int add_get_index_stringl(zval *arg, ulong index, char *str, uint length, void **dest, int duplicate) { zval *tmp; @@ -1612,7 +1612,7 @@ return zend_hash_index_update(Z_ARRVAL_P(arg), index, (void *) &tmp, sizeof(zval *), dest); } -ZEND_API int add_get_index_binary(zval *arg, uint index, char *str, void **dest, int duplicate) +ZEND_API int add_get_index_binary(zval *arg, ulong index, char *str, void **dest, int duplicate) { zval *tmp; TSRMLS_FETCH(); @@ -1624,7 +1624,7 @@ } -ZEND_API int add_get_index_binaryl(zval *arg, uint index, char *str, uint length, void **dest, int duplicate) +ZEND_API int add_get_index_binaryl(zval *arg, ulong index, char *str, uint length, void **dest, int duplicate) { zval *tmp; TSRMLS_FETCH(); @@ -1636,7 +1636,7 @@ } -ZEND_API int add_get_index_unicode(zval *arg, uint index, UChar *str, void **dest, int duplicate) +ZEND_API int add_get_index_unicode(zval *arg, ulong index, UChar *str, void **dest, int duplicate) { zval *tmp; @@ -1647,7 +1647,7 @@ } -ZEND_API int add_get_index_unicodel(zval *arg, uint index, UChar *str, uint length, void **dest, int duplicate) +ZEND_API int add_get_index_unicodel(zval *arg, ulong index, UChar *str, uint length, void **dest, int duplicate) { zval *tmp; http://cvs.php.net/diff.php/ZendEngine2/zend_API.h?r1=1.224&r2=1.225&ty=u Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.224 ZendEngine2/zend_API.h:1.225 --- ZendEngine2/zend_API.h:1.224 Tue Oct 25 15:38:09 2005 +++ ZendEngine2/zend_API.h Fri Oct 28 09:48:15 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.224 2005/10/25 19:38:09 helly Exp $ */ +/* $Id: zend_API.h,v 1.225 2005/10/28 13:48:15 dmitry Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -411,18 +411,18 @@ #define add_next_index_unset(__arg) add_next_index_null(__arg) #define add_property_unset(__arg, __key) add_property_null(__arg, __key) -ZEND_API int add_index_long(zval *arg, uint idx, long n); -ZEND_API int add_index_null(zval *arg, uint idx); -ZEND_API int add_index_bool(zval *arg, uint idx, int b); -ZEND_API int add_index_resource(zval *arg, uint idx, int r); -ZEND_API int add_index_double(zval *arg, uint idx, double d); -ZEND_API int add_index_string(zval *arg, uint idx, char *str, int duplicate); -ZEND_API int add_index_stringl(zval *arg, uint idx, char *str, uint length, int duplicate); -ZEND_API int add_index_binary(zval *arg, uint idx, char *str, int duplicate TSRMLS_DC); -ZEND_API int add_index_binaryl(zval *arg, uint idx, char *str, uint length, int duplicate TSRMLS_DC); -ZEND_API int add_index_unicode(zval *arg, uint idx, UChar *str, int duplicate); -ZEND_API int add_index_unicodel(zval *arg, uint idx, UChar *str, uint length, int duplicate); -ZEND_API int add_index_zval(zval *arg, uint index, zval *value); +ZEND_API int add_index_long(zval *arg, ulong idx, long n); +ZEND_API int add_index_null(zval *arg, ulong idx); +ZEND_API int add_index_bool(zval *arg, ulong idx, int b); +ZEND_API int add_index_resource(zval *arg, ulong idx, int r); +ZEND_API int add_index_double(zval *arg, ulong idx, double d); +ZEND_API int add_index_string(zval *arg, ulong idx, char *str, int duplicate); +ZEND_API int add_index_stringl(zval *arg, ulong idx, char *str, uint length, int duplicate); +ZEND_API int add_index_binary(zval *arg, ulong idx, char *str, int duplicate TSRMLS_DC); +ZEND_API int add_index_binaryl(zval *arg, ulong idx, char *str, uint length, int duplicate TSRMLS_DC); +ZEND_API int add_index_unicode(zval *arg, ulong idx, UChar *str, int duplicate); +ZEND_API int add_index_unicodel(zval *arg, ulong idx, UChar *str, uint length, int duplicate); +ZEND_API int add_index_zval(zval *arg, ulong index, zval *value); #define add_index_text(arg, idx, str, duplicate) \ if (UG(unicode)) { \ @@ -528,14 +528,14 @@ #define add_get_assoc_string(__arg, __key, __str, __dest, __duplicate) add_get_assoc_string_ex(__arg, __key, strlen(__key)+1, __str, __dest, __duplicate) #define add_get_assoc_stringl(__arg, __key, __str, __length, __dest, __duplicate) add_get_assoc_stringl_ex(__arg, __key, strlen(__key)+1, __str, __length, __dest, __duplicate) -ZEND_API int add_get_index_long(zval *arg, uint idx, long l, void **dest); -ZEND_API int add_get_index_double(zval *arg, uint idx, double d, void **dest); -ZEND_API int add_get_index_string(zval *arg, uint idx, char *str, void **dest, int duplicate); -ZEND_API int add_get_index_stringl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate); -ZEND_API int add_get_index_binary(zval *arg, uint idx, char *str, void **dest, int duplicate); -ZEND_API int add_get_index_binaryl(zval *arg, uint idx, char *str, uint length, void **dest, int duplicate); -ZEND_API int add_get_index_unicode(zval *arg, uint idx, UChar *str, void **dest, int duplicate); -ZEND_API int add_get_index_unicodel(zval *arg, uint idx, UChar *str, uint length, void **dest, int duplicate); +ZEND_API int add_get_index_long(zval *arg, ulong idx, long l, void **dest); +ZEND_API int add_get_index_double(zval *arg, ulong idx, double d, void **dest); +ZEND_API int add_get_index_string(zval *arg, ulong idx, char *str, void **dest, int duplicate); +ZEND_API int add_get_index_stringl(zval *arg, ulong idx, char *str, uint length, void **dest, int duplicate); +ZEND_API int add_get_index_binary(zval *arg, ulong idx, char *str, void **dest, int duplicate); +ZEND_API int add_get_index_binaryl(zval *arg, ulong idx, char *str, uint length, void **dest, int duplicate); +ZEND_API int add_get_index_unicode(zval *arg, ulong idx, UChar *str, void **dest, int duplicate); +ZEND_API int add_get_index_unicodel(zval *arg, ulong idx, UChar *str, uint length, void **dest, int duplicate); ZEND_API int add_property_long_ex(zval *arg, char *key, uint key_len, long l TSRMLS_DC); ZEND_API int add_property_null_ex(zval *arg, char *key, uint key_len TSRMLS_DC);