[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - external/nss

[Stephan Bergmann]

 external/nss/ubsan.patch.0 |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit b99a91b790eedbfddb1ee93c183adb6d2405285e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 12 08:22:22 2015 +0200

    external/nss: -fsanitize=nonnull-attribute
    
    Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470
    (cherry picked from commit 8d2ac08383f894f428da63f4653d0cbd6649e0db)
    Reviewed-on: https://gerrit.libreoffice.org/23101
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index 298ca40..956e07b 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -1,3 +1,14 @@
+--- nss/lib/certdb/crl.c
++++ nss/lib/certdb/crl.c
+@@ -2150,7 +2150,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 @@