982302 - Braces are missing in nsBaseURLParser::ParseURL

Status: RESOLVED FIXED

(Core :: Networking, defect)

Description

[Tooru Fujisawa [:arai]]

User Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:28.0) Gecko/20100101 Firefox/28.0 (Beta/Release)
Build ID: 20140306171728



Actual results:

In nsURLParsers.cpp,
http://dxr.mozilla.org/mozilla-central/source/netwerk/base/src/nsURLParsers.cpp#43
> #define OFFSET_RESULT(component, offset) \
>     PR_BEGIN_MACRO \
>         if (component ## Pos) \
>            *component ## Pos += offset; \
>     PR_END_MACRO
http://dxr.mozilla.org/mozilla-central/source/netwerk/base/src/nsURLParsers.cpp#150 , nsBaseURLParser::ParseURL
>        if (authorityLen || pathLen)
>            ParseAfterScheme(spec, specLen,
>                             authorityPos, authorityLen,
>                             pathPos, pathLen);
>            OFFSET_RESULT(authority, offset);
>            OFFSET_RESULT(path, offset);

OFFSET_RESULT is called regardless of if-condition.
But if neither authorityLen nor pathLen is present,
also authorityPos and pathPos is not present in any case.



Expected results:

So, the code should be following:
>        if (authorityLen || pathLen) {
>            ParseAfterScheme(spec, specLen,
>                             authorityPos, authorityLen,
>                             pathPos, pathLen);
>            OFFSET_RESULT(authority, offset);
>            OFFSET_RESULT(path, offset);
>        }

Comment 1

[Tooru Fujisawa [:arai]]

Attachment: Add braces after if-condition

Comment 2

[Tooru Fujisawa [:arai]]

Thank you for reviewing!

Could you push the patch to try server?

Comment 3

[Patrick McManus [:mcmanus]]

https://tbpl.mozilla.org/?tree=Try&rev=a2d4f17c3f02

Comment 4

[Tooru Fujisawa [:arai]]

Thank you again!

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/85ccf0c7e633

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/85ccf0c7e633