diff options
Diffstat (limited to 'external/nss/ubsan.patch.0')
| -rw-r--r-- | external/nss/ubsan.patch.0 | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0 index 956e07b3a37f..ccf04b92b023 100644 --- a/external/nss/ubsan.patch.0 +++ b/external/nss/ubsan.patch.0 @@ -1,24 +1,12 @@ ---- nss/lib/certdb/crl.c -+++ nss/lib/certdb/crl.c -@@ -2150,7 +2150,7 @@ +diff -ru nss.orig/nss/lib/certdb/crl.c nss/nss/lib/certdb/crl.c +--- nss/lib/certdb/crl.c 2016-02-12 15:36:18.000000000 +0100 ++++ nss/lib/certdb/crl.c 2016-02-23 20:57:17.067924598 +0100 +@@ -1982,7 +1982,7 @@ return SECSuccess; } /* all CRLs are good, sort them by thisUpdate */ -- qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), -+ if (cache->ncrls != 0) qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), - SortCRLsByThisUpdate); - - if (cache->ncrls) ---- nss/lib/libpkix/pkix/util/pkix_tools.h -+++ nss/lib/libpkix/pkix/util/pkix_tools.h -@@ -1458,8 +1458,8 @@ - - extern PRLogModuleInfo *pkixLog; - --#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FF, 0xEEFACADE) --#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF) -+#define PKIX_MAGIC_HEADER LL_INIT(0xFEEDC0FFU, 0xEEFACADEU) -+#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00DU, 0xDEADBEEFU) - - /* see source file for function documentation */ +- qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate); ++ if (cache->ncrls != 0) qsort(cache->crls, cache->ncrls, sizeof(CachedCrl*), SortCRLsByThisUpdate); + if (cache->ncrls) { + /* pick the newest CRL */ |