TLS/SSL and crypto library
Revisión | 215276243d74b89fc8c28509d16dd2a107c65946 (tree) |
---|---|
Tiempo | 2012-03-13 00:25:53 |
Autor | Dr. Stephen Henson <steve@open...> |
Commiter | Dr. Stephen Henson |
corrected fix to PR#2711 and also cover mime_param_cmp
@@ -790,9 +790,8 @@ static int mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) | ||
790 | 790 | static int mime_hdr_cmp(const MIME_HEADER * const *a, |
791 | 791 | const MIME_HEADER * const *b) |
792 | 792 | { |
793 | - if ((*a)->name == NULL || (*b)->name == NULL) | |
794 | - return (*a)->name - (*b)->name < 0 ? -1 : | |
795 | - (*a)->name - (*b)->name > 0 ? 1 : 0; | |
793 | + if (!(*a)->name || !(*b)->name) | |
794 | + return !!(*a)->name - !!(*b)->name; | |
796 | 795 | |
797 | 796 | return(strcmp((*a)->name, (*b)->name)); |
798 | 797 | } |
@@ -800,6 +799,8 @@ static int mime_hdr_cmp(const MIME_HEADER * const *a, | ||
800 | 799 | static int mime_param_cmp(const MIME_PARAM * const *a, |
801 | 800 | const MIME_PARAM * const *b) |
802 | 801 | { |
802 | + if (!(*a)->param_name || !(*b)->param_name) | |
803 | + return !!(*a)->param_name - !!(*b)->param_name; | |
803 | 804 | return(strcmp((*a)->param_name, (*b)->param_name)); |
804 | 805 | } |
805 | 806 |