Merge pull request #696 from phil-davis/rrule-invalid-4.5

[4.5] Throw InvalidDataException when RRule is invalid
sabre-io · Oct 14, 2024 · 72ec4ce · 72ec4ce
2 parents 7044047 + 8b3e5d2
commit 72ec4ce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/Property/ICalendar/Recur.php b/lib/Property/ICalendar/Recur.php
@@ -2,6 +2,7 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
 use Sabre\Xml;
 
@@ -198,7 +199,14 @@ public static function stringToArray($value)
  if (empty($part)) {
  continue;
  }
- list($partName, $partValue) = explode('=', $part);
+
+ $parts = explode('=', $part);
+
+ if (2 !== count($parts)) {
+ throw new InvalidDataException('The supplied iCalendar RRULE part is incorrect: '.$part);
+ }
+
+ list($partName, $partValue) = $parts;
 
  // The value itself had multiple values..
  if (false !== strpos($partValue, ',')) {

diff --git a/tests/VObject/Property/ICalendar/RecurTest.php b/tests/VObject/Property/ICalendar/RecurTest.php
@@ -4,6 +4,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Node;
 use Sabre\VObject\Reader;
 
@@ -194,6 +195,14 @@ public function testValidateStripNoFreq()
  );
  }
 
+ public function testUnrepairableRRule()
+ {
+ $this->expectException(InvalidDataException::class);
+ $calendar = new VCalendar();
+ $property = $calendar->createProperty('RRULE', 'IAmNotARRule');
+ $property->validate(Node::REPAIR);
+ }
+
  public function testValidateInvalidByMonthRruleWithRepair()
  {
  $calendar = new VCalendar();