Fix "strspn(): Argument #3 ($offset) must be contained..."

xp-forge · Oct 9, 2020 · 414286a · 414286a
1 parent 80842b6
commit 414286a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,11 @@ YAML for XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 6.0.1 / 2020-10-09
+
+* Fixed *strspn(): Argument #3 ($offset) must be contained...* warning
+  (@thekid)
+
 ## 6.0.0 / 2020-04-10
 
 * Implemented xp-framework/rfc#334: Drop PHP 5.6:

diff --git a/src/main/php/org/yaml/Input.class.php b/src/main/php/org/yaml/Input.class.php
@@ -267,8 +267,9 @@ private function token($in, &$offset, $end= '#') {
       $p= strcspn($in, ' ', $offset);
       $tag= substr($in, $offset + 2, $p - 2);
       $offset+= $p + 1;
+      if ($offset >= $l) return [$tag, null];
       $token= $this->token($in, $offset, $end);
-      return [$tag, null === $token ? null : $token[1]];
+      return [$tag, $token[1]];
     } else {
       $p= strcspn($in, $end, $offset);
       $literal= trim(substr($in, $offset, $p));