From 803af84dc5a4f9d029d0e5265e80eaf7794b3615 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <benj@benj.me>
Date: Thu, 31 Dec 2015 12:17:03 +0100
Subject: [PATCH] Bug 1235989 - Add a null check for filename in
 ModuleValidator::finish. r=luke

---
 js/src/asmjs/AsmJS.cpp          | 10 ++++++----
 js/src/asmjs/WasmIonCompile.cpp |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/src/asmjs/AsmJS.cpp b/js/src/asmjs/AsmJS.cpp
index b50d1688cf6d..80169567eb20 100644
--- a/js/src/asmjs/AsmJS.cpp
+++ b/js/src/asmjs/AsmJS.cpp
@@ -2034,9 +2034,12 @@ class MOZ_STACK_CLASS ModuleValidator
 
         auto mutedErrors = Module::MutedBool(parser_.ss->mutedErrors());
 
-        CacheableChars filename = make_string_copy(parser_.ss->filename());
-        if (!filename)
-            return false;
+        CacheableChars filename;
+        if (parser_.ss->filename()) {
+            filename = make_string_copy(parser_.ss->filename());
+            if (!filename)
+                return false;
+        }
 
         CacheableTwoByteChars displayURL;
         if (parser_.ss->hasDisplayURL()) {
@@ -6738,7 +6741,6 @@ CheckSwitch(FunctionValidator& f, ParseNode* switchStmt)
 
         if (!CheckStatement(f, CaseBody(stmt)))
             return false;
-
     }
 
     bool hasDefault = false;
diff --git a/js/src/asmjs/WasmIonCompile.cpp b/js/src/asmjs/WasmIonCompile.cpp
index b8ab10954377..0248b990d823 100644
--- a/js/src/asmjs/WasmIonCompile.cpp
+++ b/js/src/asmjs/WasmIonCompile.cpp
@@ -3075,7 +3075,6 @@ wasm::IonCompileFunction(IonCompileTask* task)
 
     // Compile MIR graph
     {
-
         jit::SpewBeginFunction(&mir, nullptr);
         jit::AutoSpewEndFunction spewEndFunction(&mir);