Merge pull request #895 from wordpress-mobile/issue/invalid-span-bounds

hypest · web-flow · commit 4f1a2b94be71 · 2020-02-24T14:38:55.000+02:00
Add a condition that prevents invalid span bounds
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt
@@ -177,7 +177,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat
     }
 
     private fun applySpan(span: IAztecInlineSpan, start: Int, end: Int, type: Int) {
-        if (start > end) {
+        if (start > end || start < 0 || end > editableText.length) {
             // If an external logger is available log the error there.
             val extLogger = editor.externalLogger
             if (extLogger != null) {

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle) : AztecFormat`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`private fun applySpan(span: IAztecInlineSpan, start: Int, end: Int, type: Int) {`
`180`		`- if (start > end) {`
	`180`	`+ if (start > end \|\| start < 0 \|\| end > editableText.length) {`
`181`	`181`	`// If an external logger is available log the error there.`
`182`	`182`	`val extLogger = editor.externalLogger`
`183`	`183`	`if (extLogger != null) {`