forked from pool/openssl
5fcf0408aa
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/113739 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssl?expand=0&rev=75
26 lines
918 B
Diff
26 lines
918 B
Diff
Index: openssl-1.0.0g/crypto/asn1/asn_mime.c
|
|
===================================================================
|
|
--- openssl-1.0.0g.orig/crypto/asn1/asn_mime.c
|
|
+++ openssl-1.0.0g/crypto/asn1/asn_mime.c
|
|
@@ -858,9 +858,8 @@ 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;
|
|
+ if (!(*a)->name || !(*b)->name)
|
|
+ return !!(*a)->name - !!(*b)->name;
|
|
|
|
return(strcmp((*a)->name, (*b)->name));
|
|
}
|
|
@@ -868,6 +867,8 @@ static int mime_hdr_cmp(const MIME_HEADE
|
|
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));
|
|
}
|
|
|