summaryrefslogtreecommitdiffstats
path: root/crypto/asn1
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-02-23 21:50:23 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-02-23 21:50:23 +0000
commita7096946fa93cffaf8283bc3d3b9bca77310037a (patch)
tree9f173b323ca5a03cc1961e67080534a7f7adb231 /crypto/asn1
parent4a8362a68b8f97bebeb459dada046d4395715fdc (diff)
PR: 2711
Submitted by: Tomas Mraz <tmraz@redhat.com> Tolerate bad MIME headers in parser.
Diffstat (limited to 'crypto/asn1')
-rw-r--r--crypto/asn1/asn_mime.c4
1 files changed, 4 insertions, 0 deletions
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));
}