Bug 1404349 - Extend check from bug 1370497 to apply to marks with a specific Script property, as well as those with Script=Inherited. r=valentin

netwerk/dns/nsIDNService.cpp

@@ -780,7 +780,6 @@ bool nsIDNService::isLabelSafe(const nsAString &label)
       if (illegalScriptCombo(script, savedScript)) {
         return false;
       }
-      lastScript = script;
     }
 
     // Check for mixed numbering systems
@@ -833,6 +832,10 @@ bool nsIDNService::isLabelSafe(const nsAString &label)
       }
     }
 
+    if (script != Script::COMMON && script != Script::INHERITED) {
+      lastScript = script;
+    }
+
     // Simplified/Traditional Chinese check temporarily disabled -- bug 857481
 #if 0
 

netwerk/test/unit/test_idn_urls.js

@@ -300,6 +300,9 @@ const testcases = [
     ["goo\u0650gle", "xn--google-yri", false, false, false],
     // ...but Arabic diacritics are allowed on Arabic text
     ["العَرَبِي", "xn--mgbc0a5a6cxbzabt", false, true, true],
+
+    // Hebrew diacritic also not allowed in Latin text (bug 1404349)
+    ["goo\u05b4gle", "xn--google-rvh", false, false, false],
 ];
 
 const profiles = ["ASCII", "high", "moderate"];