From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 22 Apr 2016 17:37:42 +0000 (+0100)
Subject: In d2i_test return error for malloc failure.
X-Git-Tag: OpenSSL_1_1_0-pre6~1071
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=53e409db615550c4bf5da2c9a5f56c7065315636;p=oweals%2Fopenssl.git

In d2i_test return error for malloc failure.

Bad ASN.1 data should never be able to trigger a malloc failure so return
an error in d2i_test if a malloc failure occurs.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/test/d2i_test.c b/test/d2i_test.c
index 49882a3828..78adf489dd 100644
--- a/test/d2i_test.c
+++ b/test/d2i_test.c
@@ -108,6 +108,9 @@ static int execute_test(D2I_TEST_FIXTURE fixture)
         ret = 1;
 
  err:
+    /* Don't indicate success for memory allocation errors */
+    if (ret == 1 && ERR_GET_REASON(ERR_peek_error()) == ERR_R_MALLOC_FAILURE)
+        ret = 0;
     BIO_free(bio);
     OPENSSL_free(der);
     ASN1_item_free(value, item_type);