848895 - Hold strong refs to editrules when calling into it, and always null-check the editor in editrules code

Status: RESOLVED FIXED

(Core :: DOM: Editor, defect)

Description

[Boris Zbarsky [:bzbarsky]]

See bug 848644 for discussion.

Comment 1

[Boris Zbarsky [:bzbarsky]]

Attachment: part 1. Always hold an on-stack strong reference to mRules when calling into it.

Comment 2

[Boris Zbarsky [:bzbarsky]]

Attachment: Partial part 2

Up to about line 2878 of nsHTMLEditRules.cpp so far.  Lots more to go

Comment 3

[Andrew McCreight [:mccr8]]

Marking sec-other because this is more of a preventative measure, as far as I understand.

Comment 4

[Boris Zbarsky [:bzbarsky]]

Attachment: part 2. Null-check the pointer to the editor that the edit rules hold.

This may be the least reviewable patch I have ever written....

Comment 5

[(no longer active)]

Comment on attachment 725260 [details] [diff] [review]
part 2.  Null-check the pointer to the editor that the edit rules hold.

Review of attachment 725260 [details] [diff] [review]:
-----------------------------------------------------------------

This patch makes me so sad.  Thanks for writing it!  ;-)

::: editor/libeditor/html/nsHTMLEditRules.cpp
@@ +807,5 @@
>  
>    int32_t offset, rootOffset;
>    nsCOMPtr<nsIDOMNode> parent = nsEditor::GetNodeLocation(rootElem, &rootOffset);
> +  NS_ENSURE_STATE(mHTMLEditor);
> +    res = mHTMLEditor->GetStartNodeAndOffset(selection, getter_AddRefs(parent), &offset);

I assume you changed the indentation here by mistake.

@@ +6056,5 @@
>      for (i=listCount-1; i>=0; i--)
>      {
>        nsCOMPtr<nsIDOMNode> node = outArrayOfNodes[i];
>        if (!aDontTouchContent && IsInlineNode(node) 
> +           &&

Nit: please put this at the end of previous line.

Comment 6

[Boris Zbarsky [:bzbarsky]]

> I assume you changed the indentation here by mistake.

Yes, copy/paste brought along some spaces.

> Nit: please put this at the end of previous line.

Done.

   https://hg.mozilla.org/integration/mozilla-inbound/rev/7437279a223d
   https://hg.mozilla.org/integration/mozilla-inbound/rev/4c2a4448bd09

Comment 7

[Joe Drew (not getting mail)]

https://hg.mozilla.org/mozilla-central/rev/7437279a223d
https://hg.mozilla.org/mozilla-central/rev/4c2a4448bd09