From: jim winstead <jimw@php.net>
Date: Mon, 18 Mar 2002 02:00:57 +0000 (+0000)
Subject: Fix calculation of output buffer size in wordwrap(). (Thanks to Wez.)
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~1290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=349936c93e83ab79d917473ee491a4c7be7f7db2;p=php

Fix calculation of output buffer size in wordwrap(). (Thanks to Wez.)
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index e255dc09b5..09b2e46941 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -662,7 +662,7 @@ PHP_FUNCTION(wordwrap)
 	else {
 		/* Multiple character line break or forced cut */
 		if (linelength > 0) {
-			newtextlen = textlen + (textlen/linelength) * breakcharlen + 1;
+			newtextlen = textlen + (textlen/linelength + 1) * breakcharlen + 1;
 		}
 		else {
 			newtextlen = textlen * (breakcharlen + 1) + 1;
diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt
index d367b3a82b..3fc8f1d880 100644
--- a/ext/standard/tests/strings/wordwrap.phpt
+++ b/ext/standard/tests/strings/wordwrap.phpt
@@ -27,6 +27,8 @@ $tests = <<<TESTS
 
 "12345|12345|67890" === wordwrap("12345 1234567890", 5, "|", 1)
 
+"123|==1234567890|==123" === wordwrap("123 1234567890 123", 10, "|==", 1)
+
 TESTS;
 
 include('tests/quicktester.inc');