[PHP-CVS] cvs: php-src(PHP_4_4) /ext/standard string.c

[Stanislav Malyshev]

stas            Tue Nov 20 02:46:45 2007 UTC

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/standard       string.c 
  Log:
  merge wordwrap fix
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.333.2.52.2.16&r2=1.333.2.52.2.17&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.52.2.16 
php-src/ext/standard/string.c:1.333.2.52.2.17
--- php-src/ext/standard/string.c:1.333.2.52.2.16       Wed Jun  6 18:38:47 2007
+++ php-src/ext/standard/string.c       Tue Nov 20 02:46:45 2007
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: string.c,v 1.333.2.52.2.16 2007/06/06 18:38:47 stas Exp $ */
+/* $Id: string.c,v 1.333.2.52.2.17 2007/11/20 02:46:45 stas Exp $ */
 
 /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
 
@@ -646,6 +646,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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php