--- a/security/certverifier/ExtendedValidation.cpp
+++ b/security/certverifier/ExtendedValidation.cpp
@@ -10,17 +10,17 @@
 #include "cert.h"
 #include "certdb.h"
 #include "hasht.h"
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/Casting.h"
 #include "mozilla/PodOperations.h"
 #ifdef ANDROID
-#include "nsPrintfCString.h"
+#include "mozilla/Sprintf.h"
 #endif
 #include "pk11pub.h"
 #include "pkix/pkixtypes.h"
 #include "prerror.h"
 #include "prinit.h"
 #include "secerr.h"
 
 extern mozilla::LazyLogModule gPIPNSSLog;
@@ -1251,24 +1251,24 @@ CertIsAuthoritativeForEVPolicy(const Uni
   }
 
   return false;
 }
 
 #ifdef ANDROID
 static char sCrashReasonBuffer[1024];
 
-static void
-CrashWithReason(const char* messageFormat, const char* string,
-                PRErrorCode errorCode)
+static MOZ_FORMAT_PRINTF(1, 2) void
+CrashWithReason(const char* messageFormat, ...)
 {
-  nsPrintfCString assertionMessage(messageFormat, string, errorCode);
+  va_list ap;
+  va_start(ap, messageFormat);
   mozilla::PodArrayZero(sCrashReasonBuffer);
-  strncpy(sCrashReasonBuffer, assertionMessage.get(),
-          sizeof(sCrashReasonBuffer));
+  VsprintfLiteral(sCrashReasonBuffer, messageFormat, ap);
+  va_end(ap);
   MOZ_CRASH_ANNOTATE(sCrashReasonBuffer);
   MOZ_REALLY_CRASH();
 }
 #endif
 
 nsresult
 LoadExtendedValidationInfo()
 {