NewTabUtils.extractSite should try-catch nsIURI.asciiHost

RESOLVED FIXED in Firefox 39

Status

()

RESOLVED FIXED
3 years ago
3 years ago

People

(Reporter: adw, Assigned: adw)

Tracking

(Blocks: 1 bug)

Trunk
Firefox 40
Points:
---

Firefox Tracking Flags

(firefox39 fixed, firefox40 fixed)

Details

Attachments

(2 attachments, 1 obsolete attachment)

(Assignee)

Description

3 years ago
Created attachment 8596244 [details] [diff] [review]
patch

dveditz was seeing an exception in NewTabUtils.extractSite:

Component returned failure code: 0x80004005 (NS_ERROR_FAILURE) [nsIURI.asciiHost]  from NewTabUtils::extractSite

nsIURI.asciiHost throws NS_ERROR_FAILURE for nsJARURI and nsMozIconURI, and indeed he had some jar URIs in his PlacesProvider's top sites.
Attachment #8596244 - Flags: feedback?(edilee)
Comment on attachment 8596244 [details] [diff] [review]
patch

No need for the extra uri and host variables anymore. We can just put the return newURI.asciiHost.replace directly in the try and catch return null because both try/catch blocks just return null. I suppose technically yes, .replace shouldn't throw and could be left outside of the try -- in this case, just a "let host" and one try block still.
Attachment #8596244 - Flags: feedback?(edilee) → feedback+
(Assignee)

Comment 2

3 years ago
Created attachment 8596654 [details] [diff] [review]
patch v2
Attachment #8596244 - Attachment is obsolete: true
Attachment #8596654 - Flags: review?(ttaubert)
Attachment #8596654 - Flags: review?(ttaubert) → review+
(Assignee)

Comment 3

3 years ago
https://hg.mozilla.org/integration/fx-team/rev/6ac6d95398cc
Assignee: nobody → adw
Status: NEW → ASSIGNED
https://hg.mozilla.org/mozilla-central/rev/6ac6d95398cc
Status: ASSIGNED → RESOLVED
Last Resolved: 3 years ago
status-firefox40: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → Firefox 40
No longer blocks: 1160372
No longer blocks: 1161412
Comment on attachment 8602804 [details] [diff] [review]
for aurora

Approved for uplift to aurora as requested in bug 1161412.
Attachment #8602804 - Flags: approval-mozilla-aurora+
You need to log in before you can comment on or make changes to this bug.