Bug 874080 - Add an early return to nsExternalHelperAppService::GetTypeFromExtension when called with an empty extension parameter. r=paolo

This commit is contained in:
Ryan VanderMeulen 2013-07-02 15:49:06 -04:00
parent 47b6ebfd9f
commit 9b129014be
10 changed files with 4 additions and 36 deletions

View File

@ -22,10 +22,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=758258
var Ci = Components.interfaces;
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(2, 4);
}
SimpleTest.waitForExplicitFinish();
/*

View File

@ -22,10 +22,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
let didFail = false;

View File

@ -32,10 +32,6 @@ close window
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
/** Test for Bug 462172 **/
var missingFileElid;
var realFileElid;

View File

@ -22,10 +22,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
function test()
{
var dmui = getDMUI();

View File

@ -23,10 +23,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(2);
}
const DLMGR_UI_DONE = "download-manager-ui-done";
Components.utils.import("resource://gre/modules/Services.jsm");

View File

@ -20,10 +20,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1, 2);
}
function test()
{
var dmui = getDMUI();

View File

@ -19,10 +19,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
function test()
{
var dmui = getDMUI();

View File

@ -22,10 +22,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
function test_meta_k(aWin)
{
let doc = aWin.document;

View File

@ -21,10 +21,6 @@
<script type="application/javascript">
<![CDATA[
if (navigator.platform.startsWith("Linux")) {
SimpleTest.expectAssertions(1);
}
function test()
{
var dmui = getDMUI();

View File

@ -2441,6 +2441,10 @@ NS_IMETHODIMP nsExternalHelperAppService::GetTypeFromExtension(const nsACString&
// 5. Information from plugins
// 6. The "ext-to-type-mapping" category
// Early return if called with an empty extension parameter
if (aFileExt.IsEmpty())
return NS_ERROR_NOT_AVAILABLE;
nsresult rv = NS_OK;
// First of all, check our default entries
for (size_t i = 0; i < ArrayLength(defaultMimeEntries); i++)