Merge branch 'release/4.0.1' into v4

nystudio107 · Aug 15, 2022 · d72b8c0 · d72b8c0
2 parents bb237a0 + aa4dabf
commit d72b8c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # iCalendar Changelog
 
+## 4.0.1 - 2022.09.15
+### Changed
+* Fixed an issue with multi-byte encoded content that would cause PHP to run out of memory ([#34](https://github.com/nystudio107/craft-icalendar/issues/34))
+
 ## 4.0.0 - 2022.06.29
 ### Added
 * Initial Craft CMS 4 release

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-icalendar",
   "description": "Tools for parsing & formatting the RFC 2445 iCalendar (.ics) specification",
   "type": "craft-plugin",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/services/Convert.php b/src/services/Convert.php
@@ -11,7 +11,6 @@
 namespace nystudio107\icalendar\services;
 
 use craft\base\Component;
-use function strlen;
 
 /**
  * @author    nystudio107
@@ -76,14 +75,14 @@ protected function icalSplit(string $preamble, string $value): string
         $value = html_entity_decode($value);
         $value = preg_replace('/\n+/', ' ', $value);
         $value = preg_replace('/\s{2,}/', ' ', $value);
-        $preamble_len = strlen($preamble);
+        $preamble_len = mb_strlen($preamble);
         $lines = [];
-        while (strlen($value) > (self::MAX_OCTETS - $preamble_len)) {
+        while (mb_strlen($value) > (self::MAX_OCTETS - $preamble_len)) {
             $space = (self::MAX_OCTETS - $preamble_len);
             $mbcc = $space;
             while ($mbcc) {
                 $line = mb_substr($value, 0, $mbcc);
-                $oct = strlen($line);
+                $oct = mb_strlen($line);
                 if ($oct > $space) {
                     $mbcc -= $oct - $space;
                 } else {