Bug 579077 - WARNING: NS_ENSURE_TRUE(mBoundFrame) failed: file ../../../../../content/html/content/src/nsTextEditorState.cpp, line 1326; r=jst approval2.0=benjamin

content/html/content/src/nsHTMLInputElement.cpp

@@ -780,7 +780,7 @@ NS_IMETHODIMP_(void)
 nsHTMLInputElement::UnbindFromFrame(nsTextControlFrame* aFrame)
 {
   nsTextEditorState *state = GetEditorState();
-  if (state) {
+  if (state && aFrame) {
     state->UnbindFromFrame(aFrame);
   }
 }

content/html/content/src/nsHTMLTextAreaElement.cpp

@@ -449,7 +449,9 @@ nsHTMLTextAreaElement::BindToFrame(nsTextControlFrame* aFrame)
 NS_IMETHODIMP_(void)
 nsHTMLTextAreaElement::UnbindFromFrame(nsTextControlFrame* aFrame)
 {
-  mState->UnbindFromFrame(aFrame);
+  if (aFrame) {
+    mState->UnbindFromFrame(aFrame);
+  }
 }
 
 NS_IMETHODIMP