Ticket #5794: 5794.patch

_source/core/dom/range.js

@@ -1382 +1382 @@
                         // we will not need this check for our use of this class so we can
                         // ignore it for now.
 
-                        // Fixing invalid range start inside dtd empty elements.
-                        if( startNode.type == CKEDITOR.NODE_ELEMENT
+                        // Fixing invalid range start inside dtd empty elements. (#5568)
+                        if( startNode && startNode.type == CKEDITOR.NODE_ELEMENT
                                 && CKEDITOR.dtd.$empty[ startNode.getName() ] )
                                 startNode = startNode.getParent(), startOffset = startNode.getIndex();
 
@@ -1413 +1413 @@
                         // will not need this check for our use of this class so we can ignore
                         // it for now.
 
-                        // Fixing invalid range end inside dtd empty elements.
-                        if( endNode.type == CKEDITOR.NODE_ELEMENT
+                        // Fixing invalid range end inside dtd empty elements. (#5568)
+                        if( endNode && endNode.type == CKEDITOR.NODE_ELEMENT
                                 && CKEDITOR.dtd.$empty[ endNode.getName() ] )
                                 endNode = endNode.getParent(), endOffset = endNode.getIndex() + 1;