Merge 73818

WebCore/dom/Range.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Gunnstein Lye (gunnstein@netcom.no)
  * (C) 2000 Frederik Holljen (frederik.holljen@hig.no)
  * (C) 2001 Peter Kelly (pmk@post.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 776 matching lines @@
             if (action == EXTRACT_CONTENTS || action == DELETE_CONTENTS) {
                 ProcessingInstruction* pi = static_cast<ProcessingInstruction*>(m_end.container());
                 pi->setData(pi->data().substring(m_end.offset()), ec);
             }
         } else {
             if (action == EXTRACT_CONTENTS || action == CLONE_CONTENTS)
                 rightContents = m_end.container()->cloneNode(false);
             Node* n = m_end.container()->firstChild();
             if (n && m_end.offset()) {
                 NodeVector nodes;
-                for (int i = 0; i + 1 < m_end.offset() && n; i++, n = n->nextSibling()) {
+                int i = 0;
+                do {
                     nodes.append(n);
-                }
+                    if (!n->nextSibling())
+                        break;
+                    n = n->nextSibling();
+                } while (i + 1 < m_end.offset());
                 for (int i = nodes.size() - 1; i >= 0; i--) {
-                    Node* n = nodes[i].get();
+                    n = nodes[i].get();
                     if (action == EXTRACT_CONTENTS)
                         rightContents->insertBefore(n, rightContents->firstChild(), ec); // will remove n from its parent
                     else if (action == CLONE_CONTENTS)
                         rightContents->insertBefore(n->cloneNode(true), rightContents->firstChild(), ec);
                     else
                         toContainerNode(m_end.container())->removeChild(n, ec);
                 }
             }
         }
 
@@ skipping 1172 matching lines @@
 {
     if (range && range->boundaryPointsValid()) {
         WebCore::Position start = range->startPosition();
         WebCore::Position end = range->endPosition();
         start.node()->showTreeAndMark(start.node(), "S", end.node(), "E");
         fprintf(stderr, "start offset: %d, end offset: %d\n", start.deprecatedEditingOffset(), end.deprecatedEditingOffset());
     }
 }
 
 #endif