More memory leaks and unchecked allocations; OpenSSL PR #3403 via OpenSSL

trunk. (note we had already fixed some of the issues in that PR independently)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c
index 41b39efa7b..994531837f 100644
--- a/src/lib/libcrypto/asn1/asn_mime.c
+++ b/src/lib/libcrypto/asn1/asn_mime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn_mime.c,v 1.20 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: asn_mime.c,v 1.21 2014/07/11 13:41:59 miod Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -675,6 +675,8 @@ STACK_OF(MIME_HEADER) *mime_parse_hdr(BIO *bio)
         int len, state, save_state = 0;
 
         headers = sk_MIME_HEADER_new(mime_hdr_cmp);
+        if (!headers)
+                return NULL;
         while ((len = BIO_gets(bio, linebuf, MAX_SMLEN)) > 0) {
                 /* If whitespace at line start then continuation line */
                 if (mhdr && isspace((unsigned char)linebuf[0]))