mirror of
https://abf.rosa.ru/djam/openssl.git
synced 2025-02-23 16:22:50 +00:00
26 lines
826 B
Diff
26 lines
826 B
Diff
|
|
http://cvs.openssl.org/chngview?cn=22144 (CVE-2006-7250)
|
|
http://cvs.openssl.org/chngview?cn=22252 (CVE-2012-1165)
|
|
|
|
The CVE-2012-1165 fix corrects the CVE-2006-7250 fix
|
|
|
|
--- crypto/asn1/asn_mime.c 2008-08-05 15:55:53.000000000 +0000
|
|
+++ crypto/asn1/asn_mime.c.oden 2012-03-26 10:52:42.000000000 +0000
|
|
@@ -858,12 +858,17 @@ 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 || !(*b)->name)
|
|
+ return !!(*a)->name - !!(*b)->name;
|
|
+
|
|
return(strcmp((*a)->name, (*b)->name));
|
|
}
|
|
|
|
static int mime_param_cmp(const MIME_PARAM * const *a,
|
|
const MIME_PARAM * const *b)
|
|
{
|
|
+ if (!(*a)->param_name || !(*b)->param_name)
|
|
+ return !!(*a)->param_name - !!(*b)->param_name;
|
|
return(strcmp((*a)->param_name, (*b)->param_name));
|
|
}
|
|
|