cvs: php4 /ext/pcre php_pcre.c

andrei Sun Jul 14 18:36:48 2002 EDT Modified files: /php4/ext/pcre php_pcre.c Log: Fix Bug #18341. @- Fixed cases where preg_split() incorrectly terminated final element if @ it contained null byte. (Andrei) Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.126 php4/ext/pcre/php_pcre.c:1.127 --- php4/ext/pcre/php_pcre.c:1.126 Wed Jun 12 21:04:40 2002 +++ php4/ext/pcre/php_pcre.c Sun Jul 14 18:36:47 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.126 2002/06/13 01:04:40 sniper Exp $ */ +/* $Id: php_pcre.c,v 1.127 2002/07/14 22:36:47 andrei Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1245,8 +1245,9 @@ add_offset_pair(return_value, &Z_STRVAL_PP(subject)[start_offset], Z_STRLEN_PP(subject) - start_offset, start_offset); } else { /* Add the last piece to the return value */ - add_next_index_string(return_value, - &Z_STRVAL_PP(subject)[start_offset], 1); + add_next_index_stringl(return_value, + &Z_STRVAL_PP(subject)[start_offset], + Z_STRLEN_PP(subject) - start_offset, 1); } }