Merge pull request #2310 from HDInnovations/6.x.x

(Release) v6.3.0
HDInnovations · Jul 19, 2022 · 683cc04 · 683cc04
2 parents a5cd46c + 31b8db2
commit 683cc04
Show file tree

Hide file tree

Showing 37 changed files with 1,517 additions and 1,866 deletions.
diff --git a/app/Helpers/Bbcode.php b/app/Helpers/Bbcode.php
@@ -268,8 +268,21 @@ public function parse($source): string
         // Character index
         $index = 0;
 
-        // Loop until there are no more occurrences of '['
-        while ($index < \strlen($source) && ($index = \stripos($source, '[', $index)) !== false) {
+        // Don't loop more than the length of the source
+        while ($index < \strlen($source)) {
+            // Get the next occurrence of `[`
+            $index = \stripos($source, '[', $index);
+
+            // Break if there are no more occurrences of `[`
+            if ($index === false) {
+                break;
+            }
+
+            // Break if `[` is the last character of the source
+            if ($index + 1 >= \strlen($source)) {
+                break;
+            }
+
             // Is the potential tag opening or closing?
             if ($source[$index + 1] === '/' && ! empty($openedElements)) {
                 $name = \array_pop($openedElements);