Check line length to account for fence post.

When we have exactly 998 bytes CakeEmail should not emit an error. Refs #5948
cakephp · Feb 25, 2015 · b80a894 · b80a894
1 parent ef82096
commit b80a894
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
@@ -1421,7 +1421,7 @@ protected function _wrap($message, $wrapLength = CakeEmail::LINE_LENGTH_MUST) {
 				$tmpLine .= $char;
 				$tmpLineLength++;
 				if ($tmpLineLength === $wrapLength) {
-					$nextChar = $line[$i + 1];
+					$nextChar = isset($line[$i + 1]) ? $line[$i + 1] : '';
 					if ($nextChar === ' ' || $nextChar === '<') {
 						$formatted[] = trim($tmpLine);
 						$tmpLine = '';

diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -2435,6 +2435,25 @@ public function testZeroOnlyLinesNotBeingEmptied() {
 		$this->assertEquals($expected, $result['message']);
 	}
 
+/**
+ * Test that really long lines don't cause errors.
+ *
+ * @return void
+ */
+	public function testReallyLongLine() {
+		$this->CakeEmail->reset();
+		$this->CakeEmail->config(array('empty'));
+		$this->CakeEmail->transport('Debug');
+		$this->CakeEmail->from('cake@cakephp.org');
+		$this->CakeEmail->to('cake@cakephp.org');
+		$this->CakeEmail->subject('Wordwrap Test');
+		$this->CakeEmail->emailFormat('html');
+		$this->CakeEmail->template('long_line', null);
+		$result = $this->CakeEmail->send();
+		$this->assertContains('<a>', $result['message'], 'First bits are included');
+		$this->assertContains('x', $result['message'], 'Last byte are included');
+	}
+
 /**
  * CakeEmailTest::assertLineLengths()
  *

diff --git a/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp b/lib/Cake/Test/test_app/View/Emails/html/long_line.ctp
@@ -0,0 +1,14 @@
+<?php
+echo '<a>34567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+'1234567890123456789012345678901234567890123456x';