From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 23 Feb 2012 21:50:32 +0000 (+0000)
Subject: PR: 2711
X-Git-Tag: OpenSSL_1_0_1-beta3~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=697e4edcadc13d61871518cf6111ff0349831afe;p=oweals%2Fopenssl.git

PR: 2711
Submitted by: Tomas Mraz <tmraz@redhat.com>

Tolerate bad MIME headers in parser.
---

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index bbc4952918..dc2a35d0c8 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -858,6 +858,10 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value)
 static int mime_hdr_cmp(const MIME_HEADER * const *a,
 			const MIME_HEADER * const *b)
 {
+	if ((*a)->name == NULL || (*b)->name == NULL)
+		return (*a)->name - (*b)->name < 0 ? -1 :
+			(*a)->name - (*b)->name > 0 ? 1 : 0;
+
 	return(strcmp((*a)->name, (*b)->name));
 }