From 2c199039f53330010a06a13bb6ecfd46e90caccb Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Fri, 11 Apr 2014 00:33:47 -0400 Subject: [PATCH] bug 962658 - test_badMimeType.html | Assertion count 6 is greater than expected range 0-0 assertions. on Android 4.0 Debug r=gbrown --HG-- extra : rebase_source : e601fa6f2ed385a28bb25550c4a13aa63f5a452b --- uriloader/exthandler/android/nsMIMEInfoAndroid.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp index 713cf7d63956..dfafce288874 100644 --- a/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp +++ b/uriloader/exthandler/android/nsMIMEInfoAndroid.cpp @@ -50,7 +50,13 @@ nsMIMEInfoAndroid::GetMimeInfoForMimeType(const nsACString& aMimeType, } nsIHandlerApp* systemDefault = nullptr; - bridge->GetHandlersForMimeType(NS_ConvertUTF8toUTF16(aMimeType), + + if (!IsUTF8(aMimeType, true)) + return false; + + NS_ConvertUTF8toUTF16 mimeType(aMimeType); + + bridge->GetHandlersForMimeType(mimeType, info->mHandlerApps, &systemDefault); if (systemDefault)