cvs: php-src /ext/standard string.c /ext/standard/tests/strings wordwrap.phpt

jani Mon Jul 23 11:47:44 2007 UTC Modified files: /php-src/ext/standard string.c /php-src/ext/standard/tests/strings wordwrap.phpt Log: MFB: Fixed "Floating point exception" inside wordwrap() http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.648&r2=1.649&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.648 php-src/ext/standard/string.c:1.649 --- php-src/ext/standard/string.c:1.648 Sun Jul 15 19:50:06 2007 +++ php-src/ext/standard/string.c Mon Jul 23 11:47:44 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.648 2007/07/15 19:50:06 jani Exp $ */ +/* $Id: string.c,v 1.649 2007/07/23 11:47:44 jani Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -856,6 +856,11 @@ RETURN_EMPTY_STRING(); } + if (breakcharlen == 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Break string cannot be empty"); + RETURN_FALSE; + } + if (linelength == 0 && docut) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't force cut when width is zero"); RETURN_FALSE; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap.phpt?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap.phpt diff -u php-src/ext/standard/tests/strings/wordwrap.phpt:1.7 php-src/ext/standard/tests/strings/wordwrap.phpt:1.8 --- php-src/ext/standard/tests/strings/wordwrap.phpt:1.7 Wed May 19 08:45:23 2004 +++ php-src/ext/standard/tests/strings/wordwrap.phpt Mon Jul 23 11:47:44 2007 @@ -27,6 +27,8 @@ "123|==1234567890|==123" === wordwrap("123 1234567890 123", 10, "|==", 1) +FALSE === @wordwrap(chr(0), 0, "") + TESTS; include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');