cvs: php-src(PHP_4_3) / NEWS /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt

iliaa Sun Apr 3 14:09:57 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/standard string.c /php-src/ext/standard/tests/strings chunk_split.phpt /php-src NEWS Log: MFH: Fixed bug #32530 (chunk_split() does not append endstr if chunklen is longer then the original string). http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.48&r2=1.333.2.49&ty=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.333.2.48 php-src/ext/standard/string.c:1.333.2.49 --- php-src/ext/standard/string.c:1.333.2.48 Thu Jan 20 12:57:41 2005 +++ php-src/ext/standard/string.c Sun Apr 3 14:09:54 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.333.2.48 2005/01/20 17:57:41 iliaa Exp $ */ +/* $Id: string.c,v 1.333.2.49 2005/04/03 18:09:54 iliaa Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1576,7 +1576,13 @@ } if (chunklen > Z_STRLEN_PP(p_str)) { - RETURN_STRINGL(Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str), 1); + /* to maintain BC, we must return original string + ending */ + result_len = endlen + Z_STRLEN_PP(p_str); + result = emalloc(result_len + 1); + memcpy(result, Z_STRVAL_PP(p_str), Z_STRLEN_PP(p_str)); + memcpy(result + Z_STRLEN_PP(p_str), end, endlen); + result[result_len] = '\0'; + RETURN_STRINGL(result, result_len, 0); } if (!Z_STRLEN_PP(p_str)) { http://cvs.php.net/diff.php/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.1&r2=1.1.2.1&ty=u Index: php-src/ext/standard/tests/strings/chunk_split.phpt diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.1 php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1 --- php-src/ext/standard/tests/strings/chunk_split.phpt:1.1 Sun Oct 6 15:12:22 2002 +++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Apr 3 14:09:55 2005 @@ -7,6 +7,7 @@ echo chunk_split('abc', 1, '-')."\n"; echo chunk_split('foooooooooooooooo', 5)."\n"; echo chunk_split(str_repeat('X', 2*76))."\n"; +echo chunk_split("test", 10, "|end") . "\n"; ?> --EXPECT-- a-b-c- @@ -17,3 +18,5 @@ XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + +test|end http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.867&r2=1.1247.2.868&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1247.2.867 php-src/NEWS:1.1247.2.868 --- php-src/NEWS:1.1247.2.867 Sat Apr 2 01:03:12 2005 +++ php-src/NEWS Sun Apr 3 14:09:55 2005 @@ -5,6 +5,8 @@ them sort based on the current locale. (Derick) - Fixed bug #32538 (ext/swf/swf.c does not compile with gcc-3.4.x or newer). (adam dot greenfield at gmail dot com) +- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is + longer then the original string). (Ilia) 31 Mar 2005, Version 4.3.11 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)