1240484 - [Static Analysis][Nesting level does not match indentation] In function ShutdownXPCOM from XPCOMInit.cpp

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Andi [:andi]]

The Static Analysis tool Coverity added that there could be a control flow issue, on the following code:

>>    if (observerService)
>>      mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownThreads);
>>      observerService->NotifyObservers(nullptr,
>>                                       NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID,
>>                                       nullptr);

As it can be seen from the above code, i think there should be brackets and the actual if branch should look like this, specially that observerService is null checked and dereferenced later on:

>>    if (observerService)
>>    {
>>      mozilla::KillClearOnShutdown(ShutdownPhase::ShutdownThreads);
>>      observerService->NotifyObservers(nullptr,
>>          NS_XPCOM_SHUTDOWN_THREADS_OBSERVER_ID,
>>          nullptr);
>>    }

Comment 1

[Andi [:andi]]

Attachment: MozReview Request: Bug 1240484 - fixed control flow patch issue by adding brackets. r?mccr8

Review commit: https://reviewboard.mozilla.org/r/31203/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/31203/

Comment 2

[Andi [:andi]]

Comment on attachment 8708971 [details]
MozReview Request: Bug 1240484 - fixed control flow patch issue by adding brackets. r?mccr8

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/31203/diff/1-2/

Comment 3

[Andrew McCreight [:mccr8]]

Nice. It looks like the dropped check only because an issue in bug 1237794.

I don't understand why the brace for this if block wasn't added in bug 1046841, but oh well.

Comment 4

[Andrew McCreight [:mccr8]]

(In reply to Andrew McCreight [:mccr8] from comment #3)
> Nice. It looks like the dropped check only because an issue in bug 1237794.

I meant, "only became an issue in bug 1237794".

Comment 5

[Andrew McCreight [:mccr8]]

Comment on attachment 8708971 [details]
MozReview Request: Bug 1240484 - fixed control flow patch issue by adding brackets. r?mccr8

https://reviewboard.mozilla.org/r/31203/#review27993

Comment 6

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/5df98a0e4cdd

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/5df98a0e4cdd