Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git am --ignore-whitespace /Users/stronk7/Downloads/MDL-71722-master.mdk.patch
- Applying: MDL-71722 h5plib_v124: Upgrade ckeditor to 4.17.1
- Using index info to reconstruct a base tree...
- .git/rebase-apply/patch:445: tab in indent.
- Issue summary: The vulnerability allowed to inject malformed comments HTML bypassing content sanitization, which could result in executing JavaScript code. See [security advisory](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-7h26-63m7-qhf2) for more details.
- .git/rebase-apply/patch:449: tab in indent.
- Issue summary: The vulnerability allowed to inject malformed HTML bypassing content sanitization, which could result in executing JavaScript code. See [security advisory](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-pvmx-g8h5-cprj) for more details.
- .git/rebase-apply/patch:511: tab in indent.
- Issue summary: The vulnerability allowed to abuse paste functionality using malformed HTML, which could result in injecting arbitrary HTML into the editor. See [security advisory](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-7889-rm5j-hpgg) for more details.
- .git/rebase-apply/patch:515: tab in indent.
- Issue summary: The vulnerability allowed to abuse undo functionality using malformed [Widget](https://ckeditor.com/cke4/addon/widget) HTML, which could result in executing JavaScript code. See [security advisory](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-6226-h7ff-ch6c) for more details.
- .git/rebase-apply/patch:519: tab in indent.
- Issue summary: The vulnerability allowed to inject malformed [Fake Objects](https://ckeditor.com/cke4/addon/fakeobjects) HTML, which could result in executing JavaScript code. See [security advisory](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-m94c-37g6-cjhc) for more details.
- warning: squelched 32 whitespace errors
- warning: 37 lines add whitespace errors.
- Falling back to patching base and 3-way merge...
- error: The following untracked working tree files would be overwritten by merge:
- h5p/h5plib/v124/joubel/editor/ckeditor/README.md
- h5p/h5plib/v124/joubel/editor/ckeditor/SECURITY.md
- h5p/h5plib/v124/joubel/editor/ckeditor/bender-runner.config.json
- h5p/h5plib/v124/joubel/editor/ckeditor/plugins/pastetools/filter/image.js
- Please move or remove them before you merge.
- Aborting
- error: Failed to merge in the changes.
- Patch failed at 0001 MDL-71722 h5plib_v124: Upgrade ckeditor to 4.17.1
Add Comment
Please, Sign In to add comment