Module Name: src
Committed By: riz
Date: Fri Mar 2 16:50:54 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto/asn1 [netbsd-6]: asn_mime.c
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1.8.1
--- src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c:1.1.1.1 Sun Jul 19 23:02:52 2009
+++ src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_mime.c Fri Mar 2 16:50:53 2012
@@ -858,6 +858,10 @@ static int mime_hdr_addparam(MIME_HEADER
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));
}
