cvs: php4 /ext/standard php_string.h string.c

sterling Tue Sep 4 05:33:30 2001 EDT Modified files: /php4/ext/standard string.c php_string.h Log: fix crash bug Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.231 php4/ext/standard/string.c:1.232 --- php4/ext/standard/string.c:1.231 Tue Sep 4 02:20:23 2001 +++ php4/ext/standard/string.c Tue Sep 4 05:33:30 2001 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.231 2001/09/04 06:20:23 sterling Exp $ */ +/* $Id: string.c,v 1.232 2001/09/04 09:33:30 sterling Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -496,7 +496,7 @@ /* {{{ php_trim2 */ -PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode TSRMLS_DC) +PHPAPI void php_trim2(zval **str, zval **what, zval *return_value, int mode TSRMLS_DC) /* mode 1 : trim left mode 2 : trim right mode 3 : trim left and right @@ -505,13 +505,13 @@ */ { register int i; - int len = str->value.str.len; + int len = Z_STRLEN_PP(str); int trimmed = 0; - char *c = str->value.str.val; + char *c = Z_STRVAL_PP(str); char mask[256]; if (what) { - php_charmask(Z_STRVAL_P(what), Z_STRLEN_P(what), mask TSRMLS_CC); + php_charmask(Z_STRVAL_PP(what), Z_STRLEN_PP(what), mask TSRMLS_CC); } else { php_charmask(" \n\r\t\v\0", 6, mask TSRMLS_CC); } @@ -561,7 +561,7 @@ convert_to_string_ex(what); } - php_trim2(*str, *what, return_value, 2 TSRMLS_CC); + php_trim2(str, what, return_value, 2 TSRMLS_CC); } /* }}} */ @@ -582,7 +582,7 @@ convert_to_string_ex(what); } - php_trim2(*str, *what, return_value, 3 TSRMLS_CC); + php_trim2(str, what, return_value, 3 TSRMLS_CC); } /* }}} */ @@ -603,7 +603,7 @@ convert_to_string_ex(what); } - php_trim2(*str, *what, return_value, 1 TSRMLS_CC); + php_trim2(str, what, return_value, 1 TSRMLS_CC); } /* }}} */ Index: php4/ext/standard/php_string.h diff -u php4/ext/standard/php_string.h:1.49 php4/ext/standard/php_string.h:1.50 --- php4/ext/standard/php_string.h:1.49 Sat Aug 11 13:03:37 2001 +++ php4/ext/standard/php_string.h Tue Sep 4 05:33:30 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_string.h,v 1.49 2001/08/11 17:03:37 zeev Exp $ */ +/* $Id: php_string.h,v 1.50 2001/09/04 09:33:30 sterling Exp $ */ /* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */ @@ -113,14 +113,14 @@ PHPAPI char *php_stristr(unsigned char *s, unsigned char *t, size_t s_len, size_t t_len); PHPAPI char *php_str_to_str(char *haystack, int length, char *needle, int needle_len, char *str, int str_len, int *_new_length); -PHPAPI void php_trim(pval *str, pval *return_value, int mode TSRMLS_DC); -PHPAPI void php_trim2(zval *str, zval *what, zval *return_value, int mode TSRMLS_DC); +PHPAPI void php_trim(zval *str, zval *return_value, int mode TSRMLS_DC); +PHPAPI void php_trim2(zval **str, zval **what, zval *return_value, int mode TSRMLS_DC); PHPAPI void php_strip_tags(char *rbuf, int len, int state, char *allow, int allow_len); PHPAPI void php_char_to_str(char *str, uint len, char from, char *to, int to_len, pval *result); -PHPAPI void php_implode(pval *delim, pval *arr, pval *return_value); -PHPAPI void php_explode(pval *delim, pval *str, pval *return_value, int limit); +PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value); +PHPAPI void php_explode(zval *delim, zval *str, zval *return_value, int limit); static inline char * php_memnstr(char *haystack, char *needle, int needle_len, char *end)