[src/netbsd-6]: src/crypto/external/bsd/openssl/dist/crypto/asn1 Pull up foll...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee240de2aefa
branches:  netbsd-6
changeset: 773861:ee240de2aefa
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Mar 02 16:50:53 2012 +0000

description:
Pull up following revision(s) (requested by tron in ticket #69):
        crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c: revision 1.2
apply upstream rev.22146: Tolerate bad MIME headers in parser.
avoids possible NULL dereference (CVE-2006-7248)

diffstat:

 crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c |  4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diffs (14 lines):

diff -r 2907218fe814 -r ee240de2aefa crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c
--- a/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c   Fri Mar 02 16:49:13 2012 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c   Fri Mar 02 16:50:53 2012 +0000
@@ -858,6 +858,10 @@
 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));
 }