external/nss/nss.patch | 11 +++++++++++ 1 file changed, 11 insertions(+)
New commits: commit 61d98a02facfd3615338582256ddf193c4cf02f8 Author: David Ostrovsky <da...@ostrovsky.org> Date: Fri Mar 4 19:59:18 2016 +0100 nss: Fix pointer truncation from 'char *' to 'long' Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005 Reviewed-on: https://gerrit.libreoffice.org/22916 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> (cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b) Reviewed-on: https://gerrit.libreoffice.org/23098 Reviewed-by: Michael Stahl <mst...@redhat.com> Reviewed-by: David Ostrovsky <da...@ostrovsky.org> Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/external/nss/nss.patch b/external/nss/nss.patch index e555d6e..d02a65b 100644 --- a/external/nss/nss.patch +++ b/external/nss/nss.patch @@ -1,3 +1,14 @@ +--- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2016-02-12 14:51:25.000000000 +0100 ++++ b/nss/nspr/pr/src/misc/prnetdb.c 2016-03-04 19:23:00.462892600 +0100 +@@ -438,7 +438,7 @@ + char *buf = *bufp; + PRIntn buflen = *buflenp; + +- if (align && ((long)buf & (align - 1))) { ++ if (align && ((ptrdiff_t)buf & (align - 1))) { + PRIntn skip = align - ((ptrdiff_t)buf & (align - 1)); + if (buflen < skip) { + return 0; diff -ru a/nspr/configure b/nspr/configure --- a/a/nspr/configure 2014-09-29 16:46:38.427423757 +0100 +++ b/b/nspr/configure 2014-09-29 16:47:42.984012225 +0100
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits