Old content with different line endings can break diff entirely [#3389010]

Problem/Motivation

An error has started popping up more and more on our project where old revisions containing \r\n line endings are resulting in errors when compared with new revisions that only contain \n

The error is Uncaught PHP Exception InvalidArgumentException: "Invalid $mode 3 specified" and results in a 503.

Steps to reproduce

I've only seen this happen with really old revisions, now \r seems to get auto stripped from WYSIWYG content.

Proposed resolution

Remaining tasks

Issue fork diff-3389010

Show commands

Start within a Git clone of the project using the version control instructions.

Add & fetch this issue fork’s repository

Or, if you do not have SSH keys set up on git.drupalcode.org:

Add & fetch this issue fork’s repository

3389010-line-endings changes, plain diff MR !33
Check out this branch for the first time

Check out existing branch, if you already have it locally

About issue forks

Comments

Comment #1

22 September 2023 at 02:35

acbramley created an issue. See original summary.

Comment #2

mstrelan commented 25 September 2023 at 23:32

This is introduced since DiffEngine is deprecated and replaced with sebastianbergmann/diff. Specifically the issue is that \Drupal\Component\Diff\DiffOpOutputBuilder::hunkOp does not handle \SebastianBergmann\Diff\Differ::DIFF_LINE_END_WARNING.