nodejs
diff --git a/‎src/crypto/crypto_aes.cc‎
Lines changed: 3 additions & 1 deletion b/‎src/crypto/crypto_aes.cc‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/crypto/crypto_chacha20_poly1305.cc‎
Lines changed: 3 additions & 1 deletion b/‎src/crypto/crypto_chacha20_poly1305.cc‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎src/crypto/crypto_cipher.cc‎
Lines changed: 9 additions & 1 deletion b/‎src/crypto/crypto_cipher.cc‎
Lines changed: 9 additions & 1 deletion
@@ -48,7 +48,9 @@ WebCryptoCipherStatus AES_Cipher(Environment* env,
   CHECK_EQ(key_data.GetKeyType(), kKeyTypeSecret);
 
   auto ctx = CipherCtxPointer::New();
-  CHECK(ctx);
+  if (!ctx) {
+    return WebCryptoCipherStatus::FAILED;
+  }
 
   if (params.cipher.isWrapMode()) {
     ctx.setAllowWrap();
 
@@ -222,7 +222,9 @@ WebCryptoCipherStatus ChaCha20Poly1305CipherTraits::DoCipher(
   return WebCryptoCipherStatus::OK;
 #else
   auto ctx = CipherCtxPointer::New();
-  CHECK(ctx);
+  if (!ctx) {
+    return WebCryptoCipherStatus::FAILED;
+  }
 
   const bool encrypt = cipher_mode == kWebCryptoCipherEncrypt;
 
 
@@ -73,6 +73,11 @@ void GetCipherInfo(const FunctionCallbackInfo<Value>& args) {
     // If it is, then the getCipherInfo will succeed with the given
     // values.
     auto ctx = CipherCtxPointer::New();
+    if (!ctx) {
+      return THROW_ERR_CRYPTO_OPERATION_FAILED(
+          env, "Failed to allocate cipher context");
+    }
+
     if (!ctx.init(cipher, true)) {
       return;
     }
@@ -343,7 +348,10 @@ void CipherBase::CommonInit(const char* cipher_type,
   MarkPopErrorOnReturn mark_pop_error_on_return;
   CHECK(!ctx_);
   ctx_ = CipherCtxPointer::New();
-  CHECK(ctx_);
+  if (!ctx_) {
+    return THROW_ERR_CRYPTO_OPERATION_FAILED(
+        env(), "Failed to allocate cipher context");
+  }
 
   if (cipher.isWrapMode()) {
     ctx_.setAllowWrap();