Bug 605979 - Remove unsound ASSERTION: IDN node too large (hit with globalStorage.namedItem); r=mayhemer
authorHan Chang <szu.han.chang@gmail.com>
Sun, 26 Jun 2011 18:28:46 +0200
changeset 71806 307da86c2dffadd9182d8b6e568755d4fcf30650
parent 71805 1cb1bf67357e95bafca06f1fe2b7bb846be5cfa9
child 71807 aaff2caf842859783e65961a7469ee5216cf470e
push id20613
push usermlamouri@mozilla.com
push dateMon, 27 Jun 2011 09:03:51 +0000
treeherdermozilla-central@aee9017b0b4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmayhemer
bugs605979
milestone7.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 605979 - Remove unsound ASSERTION: IDN node too large (hit with globalStorage.namedItem); r=mayhemer
netwerk/dns/nsIDNService.cpp
--- a/netwerk/dns/nsIDNService.cpp
+++ b/netwerk/dns/nsIDNService.cpp
@@ -581,17 +581,17 @@ nsresult nsIDNService::encodeToACE(const
 nsresult nsIDNService::stringPrepAndACE(const nsAString& in, nsACString& out,
                                         PRBool allowUnassigned)
 {
   nsresult rv = NS_OK;
 
   out.Truncate();
 
   if (in.Length() > kMaxDNSNodeLen) {
-    NS_ERROR("IDN node too large");
+    NS_WARNING("IDN node too large");
     return NS_ERROR_FAILURE;
   }
 
   if (IsASCII(in))
     LossyCopyUTF16toASCII(in, out);
   else {
     nsAutoString strPrep;
     rv = stringPrep(in, strPrep, allowUnassigned);
@@ -599,17 +599,17 @@ nsresult nsIDNService::stringPrepAndACE(
       if (IsASCII(strPrep))
         LossyCopyUTF16toASCII(strPrep, out);
       else
         rv = encodeToACE(strPrep, out);
     }
   }
 
   if (out.Length() > kMaxDNSNodeLen) {
-    NS_ERROR("IDN node too large");
+    NS_WARNING("IDN node too large");
     return NS_ERROR_FAILURE;
   }
 
   return rv;
 }
 
 // RFC 3490
 // 1) Whenever dots are used as label separators, the following characters