[PATCH] Bug 19976: don't try to load a library with an empty name

boklm · Hainish · commit 29bd06be583d · 2016-08-25T13:23:03.000-07:00
diff --git a/src/chrome/content/code/NSS.js b/src/chrome/content/code/NSS.js
@@ -25,17 +25,13 @@ function NSS() {
 
 }
 
-NSS.initialize = function(nssPath) {  
+NSS.initialize = function() {
   var sharedLib;
 
-  try {
-    sharedLib = tcypes.open(nssPath);    
-  } catch (e) {
-    Components.utils.import("resource://gre/modules/Services.jsm");
-    var nssFile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
-    nssFile.append(tcypes.libraryName("nss3"));
-    sharedLib = tcypes.open(nssFile.path);
-  }
+  Components.utils.import("resource://gre/modules/Services.jsm");
+  var nssFile = Services.dirsvc.get("GreD", Ci.nsILocalFile);
+  nssFile.append(tcypes.libraryName("nss3"));
+  sharedLib = tcypes.open(nssFile.path);
 
   NSS.types = new Object();
 
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -123,7 +123,7 @@ function SSLObservatory() {
     this.setupASNWatcher();
 
   try {
-    NSS.initialize("");
+    NSS.initialize();
   } catch(e) {
     this.log(WARN, "Failed to initialize NSS component:" + e);
   }

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ function SSLObservatory() {`
`123`	`123`	`this.setupASNWatcher();`
`124`	`124`
`125`	`125`	`try {`
`126`		`- NSS.initialize("");`
	`126`	`+ NSS.initialize();`
`127`	`127`	`} catch(e) {`
`128`	`128`	`this.log(WARN, "Failed to initialize NSS component:" + e);`
`129`	`129`	`}`