Commit dc95c53c authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

corrected fix to PR#2711 and also cover mime_param_cmp

parent b24a53dd

crypto/asn1/asn_mime.c

+4 −3
Original line number Diff line number Diff line
@@ -862,9 +862,8 @@ 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;

	if (!(*a)->name || !(*b)->name)

		return !!(*a)->name - !!(*b)->name;



	return(strcmp((*a)->name, (*b)->name));

}
@@ -872,6 +871,8 @@ static int mime_hdr_cmp(const MIME_HEADER * const *a, 
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));

}