Skip to content

Prevent crash when the mark stack runs empty in DOMSerializer #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
artif-AndreasBrus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Prevent crash when the mark stack runs empty in DOMSerializer #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Core/DOMSerializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,15 @@ private function closeMarkTags($markTagsToClose, &$markStack, &$markTagsToReopen
while (! empty($markTagsToClose)) {
# close mark tag from the top of the stack
$markTag = array_pop($markStack);

# the mark stack can run empty before every tag was closed when marks
# are nested inconsistently (e.g. a mark duplicated on a node that
# inherits the same mark from a sibling). Stop here instead of calling
# a method on null.
if ($markTag === null) {
break;
}

$markExtension = $markTag[0];
$mark = $markTag[1];
$html[] = $this->renderClosingTag($markExtension->renderHTML($mark));
Expand Down
40 changes: 40 additions & 0 deletions tests/DOMSerializer/WrongFormatTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,43 @@

expect($result)->toEqual('<a target="_blank" rel="noopener noreferrer nofollow" href="https://tiptap.dev">Example Link</a>');
});

test('duplicated mark inherited from a sibling does not crash the serializer', function () {
// The second text node carries the same mark twice while inheriting it from
// the first node. Opening is skipped for both duplicates (the sibling already
// "has" the mark), but closing fires for both, popping the mark stack once more
// than it was filled. This used to call a method on null in closeMarkTags().
$document = [
'type' => 'doc',
'content' => [
[
'type' => 'paragraph',
'content' => [
[
'type' => 'text',
'text' => 'a',
'marks' => [
['type' => 'bold'],
],
],
[
'type' => 'text',
'text' => 'b',
'marks' => [
['type' => 'bold'],
['type' => 'bold'],
],
],
],
],
],
];

$result = (new Editor([
'extensions' => [
new StarterKit,
],
]))->setContent($document)->getHTML();

expect($result)->toEqual('<p><strong>ab</strong></p>');
});