diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix21 ./esc/src/app/xpcom/rhCoolKey.cpp
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix21	2016-02-08 14:21:39.963531067 -0800
+++ ./esc/src/app/xpcom/rhCoolKey.cpp	2016-02-08 14:22:04.811322599 -0800
@@ -1237,7 +1237,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyCertN
     char **array = NULL;
     int num = nicknames.size();
 
-    array = (char **) nsMemory::Alloc((sizeof(char *) *num));
+    array = (char **) NS_Alloc((sizeof(char *) *num));
 
     if(!array)
     {
@@ -1291,7 +1291,7 @@ NS_IMETHODIMP rhCoolKey::GetAvailableCoo
         return NS_OK;
     }
 
-    array = (char **) nsMemory::Alloc((sizeof(char *) * numKeys));
+    array = (char **) NS_Alloc((sizeof(char *) * numKeys));
 
     if(!array)
     {